[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2024-03-03 Thread Joonas Niilola
commit: 1d29ef3e3ee3cfed5cc90e993c21d7abd7fe6d15
Author: Hank Leininger  korelogic  com>
AuthorDate: Thu Feb  8 22:41:09 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Mar  4 07:53:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d29ef3e

net-firewall/fwknop: add 2.6.11

Signed-off-by: Hank Leininger  korelogic.com>
Closes: https://bugs.gentoo.org/822741
Closes: https://bugs.gentoo.org/920793
Closes: https://github.com/gentoo/gentoo/pull/35236
Signed-off-by: Joonas Niilola  gentoo.org>

 net-firewall/fwknop/Manifest |   2 +
 net-firewall/fwknop/fwknop-2.6.11.ebuild | 133 +++
 2 files changed, 135 insertions(+)

diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index 53b2c9de54bf..9dca4d3387dd 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -1 +1,3 @@
 DIST fwknop-2.6.10.tar.gz 1988197 BLAKE2B 
d4c2010c64ab160f0edc02e2b1530749ee47ff6ed16d6b556d366daef7ce5e22ef38fbbbf6e8cfaa14e0d9706ba2b65937b03c70b54b3429ff1732ae33c1852c
 SHA512 
3b3e35eda574abd1759431c88677eea7078c54cb3252c0ee0e1019b5b8224ed8844d30760da70a952e1cd92b04715a547f6effabda54678f791fff9afa32cd80
+DIST fwknop-2.6.11.tar.bz2 1812061 BLAKE2B 
7cfb8abc95fd8aa8a8d6774507fe4dea8deacc5aa4c9f5874c39dc2a3ab0c413cf479632a34027c76180cecd0a4fbf11d8cac5fe77f48993932fab13ea740a0b
 SHA512 
79ce0585d075dffe77143b4d6ec3f8653ddad5f46cfb596e9f373be0065bdace7efdfe9cd341ebfaa7232d39f905affa81325b569635c8a44095fd551debadd7
+DIST fwknop-2.6.11.tar.bz2.asc 195 BLAKE2B 
56ea868bd31fc4d06e3e976042bd3969f2c8df5bcb1e6a12d87c5740eb39b2eaf1118620be260e94b07758f4bc875e58f6b63a7989cdc08a32f049aa208b57a3
 SHA512 
2902a9ccb1c82baa4a96af5841d21ac873b606876fe01e8fbcf2b1e2a89c75965477f574c62a6f261f2af4420038ea6d41ef66af57b79742527054593e3cd3d7

diff --git a/net-firewall/fwknop/fwknop-2.6.11.ebuild 
b/net-firewall/fwknop/fwknop-2.6.11.ebuild
new file mode 100644
index ..2ae43d31f5f7
--- /dev/null
+++ b/net-firewall/fwknop/fwknop-2.6.11.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/fwknop.gpg
+inherit autotools linux-info readme.gentoo-r1 systemd tmpfiles verify-sig
+
+DESCRIPTION="Single Packet Authorization and Port Knocking application"
+HOMEPAGE="https://www.cipherdyne.org/fwknop/;
+SRC_URI="
+   https://www.cipherdyne.org/fwknop/download/${P}.tar.bz2
+   verify-sig? ( 
https://www.cipherdyne.org/fwknop/download/${P}.tar.bz2.asc )
+   "
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client extras firewalld gdbm gpg +iptables nfqueue +server static-libs 
udp-server"
+
+DEPEND="
+   client? ( net-misc/wget[ssl] )
+   firewalld? ( net-firewall/firewalld )
+   gdbm? ( sys-libs/gdbm )
+   gpg? (
+   app-crypt/gpgme:=
+   dev-libs/libassuan
+   dev-libs/libgpg-error
+   )
+   iptables? ( net-firewall/iptables )
+   nfqueue? ( net-libs/libnetfilter_queue )
+   server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) )
+   verify-sig? ( sec-keys/openpgp-keys-fwknop )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="
+   nfqueue? ( server )
+   server? ( ^^ ( firewalld iptables ) )
+   udp-server? ( server )
+"
+
+##PATCHES=( "${FILESDIR}/${PN}-2.6.10_fno-common_fix.patch" )
+
+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
+}
+
+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/*
+   

[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2022-02-16 Thread David Seifert
commit: 6b0203e61b74a08f6db7febb518a4d82a2f7d8bc
Author: David Seifert  gentoo  org>
AuthorDate: Wed Feb 16 21:53:22 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Feb 16 21:53:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b0203e6

net-firewall/fwknop: add subslot op on app-crypt/gpgme

Signed-off-by: David Seifert  gentoo.org>

 .../fwknop/{fwknop-2.6.10-r2.ebuild => fwknop-2.6.10-r3.ebuild}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild 
b/net-firewall/fwknop/fwknop-2.6.10-r3.ebuild
similarity index 98%
rename from net-firewall/fwknop/fwknop-2.6.10-r2.ebuild
rename to net-firewall/fwknop/fwknop-2.6.10-r3.ebuild
index f8c21045b3ae..3b582da13606 100644
--- a/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.10-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ DEPEND="
firewalld? ( net-firewall/firewalld )
gdbm? ( sys-libs/gdbm )
gpg? (
-   app-crypt/gpgme
+   app-crypt/gpgme:=
dev-libs/libassuan
dev-libs/libgpg-error
)



[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2021-07-30 Thread Sam James
commit: 1dcb21d1b3d4b2d2eefb2d04a6cf0d56d5b1eafe
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 30 22:56:38 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 30 23:30:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dcb21d1

net-firewall/fwknop: [QA] call tmpfiles_process in pkg_postinst

This is needed to actually apply the tmpfiles configuration
we've installed in the ebuild. See tmpfiles.eclass documentation.

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sam James  gentoo.org>

 net-firewall/fwknop/fwknop-2.6.10-r2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild 
b/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild
index 5c86fee98c2..f8c21045b3a 100644
--- a/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild
@@ -108,6 +108,8 @@ pkg_postinst() {
if use server; then
readme.gentoo_print_elog
 
+   tmpfiles_process fwknopd.conf
+
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"



[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2021-03-07 Thread David Seifert
commit: abc291e8800b454e84e82741afa0ed3c2a8ce45c
Author: Theo Anderson  posteo  de>
AuthorDate: Sun Mar  7 11:57:02 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Mar  7 11:57:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abc291e8

net-firewall/fwknop: migrate to tmpfiles.eclass

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Theo Anderson  posteo.de>
Signed-off-by: David Seifert  gentoo.org>

 net-firewall/fwknop/fwknop-2.6.10-r2.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild 
b/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild
index 64a0407290b..0c11df4d567 100644
--- a/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools eutils linux-info readme.gentoo-r1 systemd
+inherit autotools eutils linux-info readme.gentoo-r1 systemd tmpfiles
 
 DESCRIPTION="Single Packet Authorization and Port Knocking application"
 HOMEPAGE="https://www.cipherdyne.org/fwknop/;
@@ -93,7 +93,7 @@ src_install() {
newinitd "${FILESDIR}/fwknopd.init" fwknopd
newconfd "${FILESDIR}/fwknopd.confd" fwknopd
systemd_dounit "${FILESDIR}/fwknopd.service"
-   systemd_newtmpfilesd "${FILESDIR}/fwknopd.tmpfiles.conf" 
fwknopd.conf
+   newtmpfiles "${FILESDIR}/fwknopd.tmpfiles.conf" fwknopd.conf
readme.gentoo_create_doc
fi
 



[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2020-08-01 Thread Andreas Sturmlechner
commit: e8052f47a54c14791f185172061d1e3256358440
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug  1 15:16:47 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug  1 23:19:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8052f47

net-firewall/fwknop: Drop 2.6.9-r1 and 2.6.10-r1

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-firewall/fwknop/Manifest|   1 -
 net-firewall/fwknop/fwknop-2.6.10-r1.ebuild | 138 --
 net-firewall/fwknop/fwknop-2.6.9-r1.ebuild  | 144 
 3 files changed, 283 deletions(-)

diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index d49b6b5fc1a..53b2c9de54b 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -1,2 +1 @@
 DIST fwknop-2.6.10.tar.gz 1988197 BLAKE2B 
d4c2010c64ab160f0edc02e2b1530749ee47ff6ed16d6b556d366daef7ce5e22ef38fbbbf6e8cfaa14e0d9706ba2b65937b03c70b54b3429ff1732ae33c1852c
 SHA512 
3b3e35eda574abd1759431c88677eea7078c54cb3252c0ee0e1019b5b8224ed8844d30760da70a952e1cd92b04715a547f6effabda54678f791fff9afa32cd80
-DIST fwknop-2.6.9.tar.gz 3043542 BLAKE2B 
11440fa0fe5e990a269587fa9ee1da0242f3dc939d6dc185d6adff9e9c995a8ffe902a6351a057c619cb6ff056519caea38f7b865978fe5ac810a39281bb3fc3
 SHA512 
4706560d44c911c8604059d88dded9c1b8c99d90ec7dc366c0fba96c79680bdbf1b8b5e76cc34aaf3a1e58fff80db8f5f20c96d57481bdb476a9b99f4d1b

diff --git a/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild 
b/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild
deleted file mode 100644
index 786366d6895..000
--- a/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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 )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-2.6.10_fno-common_fix.patch" )
-
-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"
-   

[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2020-07-01 Thread Aaron Bauman
commit: 64794ff56c4f0b40ed28d773805a1d0918199b12
Author: Hank Leininger  korelogic  com>
AuthorDate: Mon Jun  8 09:32:35 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed Jul  1 23:55:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64794ff5

net-firewall/fwknop: Drop python2-only module, cleanup .a

The fko python module is python2-only. Most(?) uses of fwknop do not
need the optional python module at all. Removed it and if that causes
problems, will deal with it.

Also added a USE=static-libs flag, and clean up .a if it is not set.

Signed-off-by: Hank Leininger  korelogic.com>
Closes: https://bugs.gentoo.org/724896
Closes: https://bugs.gentoo.org/708414
Closes: https://github.com/gentoo/gentoo/pull/16115
Signed-off-by: Aaron Bauman  gentoo.org>

 net-firewall/fwknop/fwknop-2.6.10-r2.ebuild | 126 
 1 file changed, 126 insertions(+)

diff --git a/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild 
b/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild
new file mode 100644
index 000..64a0407290b
--- /dev/null
+++ b/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools 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 +server static-libs 
udp-server"
+
+DEPEND="
+   client? ( net-misc/wget[ssl] )
+   firewalld? ( net-firewall/firewalld )
+   gdbm? ( sys-libs/gdbm )
+   gpg? (
+   app-crypt/gpgme
+   dev-libs/libassuan
+   dev-libs/libgpg-error
+   )
+   iptables? ( net-firewall/iptables )
+   nfqueue? ( net-libs/libnetfilter_queue )
+   server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="
+   nfqueue? ( server )
+   server? ( ^^ ( firewalld iptables ) )
+   udp-server? ( server )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-2.6.10_fno-common_fix.patch" )
+
+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
+}
+
+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
+
+   find "${ED}" -type f -name "*.la" -delete || die
+
+   if ! use static-libs ; then
+   find "${ED}" -type f -name libfko.a -delete || die
+   fi
+}
+
+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 && \
+ 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/files/, net-firewall/fwknop/

2020-04-10 Thread Andreas Sturmlechner
commit: 023eef270a7c2239cb7bca2c0b059aff6a52eda3
Author: Hank Leininger  korelogic  com>
AuthorDate: Tue Feb 25 06:35:19 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 10 14:57:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=023eef27

net-firewall/fwknop: fix build with -fno-common or gcc-10

Cherry-picked fix from
https://github.com/Jakuje/fwknop/commit/a87325b0816a79329cf0b4d4f9ebf247ead117db

Signed-off-by: Hank Leininger  korelogic.com>
Closes: https://bugs.gentoo.org/706816
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Closes: https://github.com/gentoo/gentoo/pull/14766
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/fwknop-2.6.10_fno-common_fix.patch   | 23 ++
 net-firewall/fwknop/fwknop-2.6.10-r1.ebuild|  2 ++
 2 files changed, 25 insertions(+)

diff --git a/net-firewall/fwknop/files/fwknop-2.6.10_fno-common_fix.patch 
b/net-firewall/fwknop/files/fwknop-2.6.10_fno-common_fix.patch
new file mode 100644
index 000..9c144cc1edd
--- /dev/null
+++ b/net-firewall/fwknop/files/fwknop-2.6.10_fno-common_fix.patch
@@ -0,0 +1,23 @@
+From a87325b0816a79329cf0b4d4f9ebf247ead117db Mon Sep 17 00:00:00 2001
+From: Jakub Jelen 
+Date: Mon, 10 Feb 2020 15:21:56 +0100
+Subject: [PATCH] Unbreak build with gcc10 (-fno-common)
+
+Signed-off-by: Jakub Jelen 
+---
+ client/log_msg.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/client/log_msg.h b/client/log_msg.h
+index cc17716b..3dda1614 100644
+--- a/client/log_msg.h
 b/client/log_msg.h
+@@ -38,7 +38,7 @@ enum
+ LOG_VERBOSITY_INFO, /*!< Constant to define a INFO message */
+ LOG_VERBOSITY_DEBUG,/*!< Constant to define a DEBUG message */
+ LOG_LAST_VERBOSITY
+-} log_level_t;
++};
+ 
+ #define LOG_DEFAULT_VERBOSITY   LOG_VERBOSITY_NORMAL/*!< Default 
verbosity to use */
+ 

diff --git a/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild 
b/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild
index 52c57d2312c..786366d6895 100644
--- a/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild
@@ -43,6 +43,8 @@ REQUIRED_USE="
udp-server? ( server )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-2.6.10_fno-common_fix.patch" )
+
 DOCS=( AUTHORS ChangeLog README )
 
 DISABLE_AUTOFORMATTING=1



[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2020-02-09 Thread Michał Górny
commit: 9d879855acc071405b2442bf5e221a39836221f1
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Feb  8 11:59:34 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb  9 15:54:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d879855

net-firewall/fwknop: Switch to python-single-r1

Switch to python-single-r1 since the dependency net-firewall/firewalld
is single-r1.

Signed-off-by: Michał Górny  gentoo.org>

 .../fwknop/{fwknop-2.6.10.ebuild => fwknop-2.6.10-r1.ebuild}   | 10 --
 net-firewall/fwknop/fwknop-2.6.9-r1.ebuild | 10 --
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/net-firewall/fwknop/fwknop-2.6.10.ebuild 
b/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild
similarity index 94%
rename from net-firewall/fwknop/fwknop-2.6.10.ebuild
rename to net-firewall/fwknop/fwknop-2.6.10-r1.ebuild
index 41a07f7c1a8..52c57d2312c 100644
--- a/net-firewall/fwknop/fwknop-2.6.10.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,6 +6,7 @@ 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
@@ -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
 

diff --git a/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild 
b/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild
index 5c86df5bfb0..03699570bd4 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
 



[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2019-11-03 Thread Joonas Niilola
commit: 91ef50928a5ec25d8fcf4ea17b105ee8e6ae938e
Author: Hank Leininger  korelogic  com>
AuthorDate: Sat Oct 26 22:46:45 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Nov  4 05:42:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91ef5092

net-firewall/fwknop: Version bump to 2.6.10.

Also changed SRC_URI to the main upstream site because github
mangles the .tar.gz to break upstream's PGP signature.

Signed-off-by: Hank Leininger  korelogic.com>
Bug: https://bugs.gentoo.org/698604
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Joonas Niilola  gentoo.org>

 net-firewall/fwknop/Manifest |   1 +
 net-firewall/fwknop/fwknop-2.6.10.ebuild | 130 +++
 2 files changed, 131 insertions(+)

diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index 27210436a6a..d49b6b5fc1a 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -1 +1,2 @@
+DIST fwknop-2.6.10.tar.gz 1988197 BLAKE2B 
d4c2010c64ab160f0edc02e2b1530749ee47ff6ed16d6b556d366daef7ce5e22ef38fbbbf6e8cfaa14e0d9706ba2b65937b03c70b54b3429ff1732ae33c1852c
 SHA512 
3b3e35eda574abd1759431c88677eea7078c54cb3252c0ee0e1019b5b8224ed8844d30760da70a952e1cd92b04715a547f6effabda54678f791fff9afa32cd80
 DIST fwknop-2.6.9.tar.gz 3043542 BLAKE2B 
11440fa0fe5e990a269587fa9ee1da0242f3dc939d6dc185d6adff9e9c995a8ffe902a6351a057c619cb6ff056519caea38f7b865978fe5ac810a39281bb3fc3
 SHA512 
4706560d44c911c8604059d88dded9c1b8c99d90ec7dc366c0fba96c79680bdbf1b8b5e76cc34aaf3a1e58fff80db8f5f20c96d57481bdb476a9b99f4d1b

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 000..41a07f7c1a8
--- /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
+   

[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2019-11-03 Thread Joonas Niilola
commit: 5c35a8973d5f0bf40d7c65b9b252f1929fb0018f
Author: Hank Leininger  korelogic  com>
AuthorDate: Sat Nov  2 18:22:16 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Nov  4 05:42:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c35a897

net-firewall/fwknop: Added myself as a proxy maintainer.

Signed-off-by: Hank Leininger  korelogic.com>
Closes: https://bugs.gentoo.org/698604
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Closes: https://github.com/gentoo/gentoo/pull/13457
Signed-off-by: Joonas Niilola  gentoo.org>

 net-firewall/fwknop/metadata.xml | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/net-firewall/fwknop/metadata.xml b/net-firewall/fwknop/metadata.xml
index 096122a1ea1..abed2bc853d 100644
--- a/net-firewall/fwknop/metadata.xml
+++ b/net-firewall/fwknop/metadata.xml
@@ -1,7 +1,14 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
+   hl...@korelogic.com
+   Hank Leininger
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   

Build fwknop client
Install utility scripts and AppArmor policy 
for fwknopd



[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2017-09-06 Thread Michał Górny
commit: f5347d53f9af1a324ef66d91a19c53629ca3b0f1
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Wed Aug 16 20:51:18 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Sep  6 12:06:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5347d53

net-firewall/fwknop: enable client, server USEs, cleanup REQUIRED_USE

Closes: https://github.com/gentoo/gentoo/pull/5468
Package-Manager: Portage-2.3.7, Repoman-2.3.3

 .../fwknop/{fwknop-2.6.9.ebuild => fwknop-2.6.9-r1.ebuild} | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/net-firewall/fwknop/fwknop-2.6.9.ebuild 
b/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild
similarity index 95%
rename from net-firewall/fwknop/fwknop-2.6.9.ebuild
rename to net-firewall/fwknop/fwknop-2.6.9-r1.ebuild
index efd4d5010ce..5c86df5bfb0 100644
--- a/net-firewall/fwknop/fwknop-2.6.9.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,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 firewalld gdbm gpg iptables nfqueue python server 
udp-server"
+IUSE="+client extras firewalld gdbm gpg +iptables nfqueue python +server 
udp-server"
 
 DEPEND="
client? ( net-misc/wget[ssl] )
@@ -36,9 +36,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 REQUIRED_USE="
-   firewalld? ( server )
-   gdbm? ( server )
-   iptables? ( server )
nfqueue? ( server )
python? ( ${PYTHON_REQUIRED_USE} )
server? ( ^^ ( firewalld iptables ) )



[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2016-09-20 Thread Patrice Clement
commit: 2cfb4d9240a13bef2e87ae9e873d2e8e7f0bf31d
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Tue Sep 20 13:02:27 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Sep 21 00:29:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cfb4d92

net-firewall/fwknop: remove old.

Closes: https://github.com/gentoo/gentoo/pull/2373
Package-Manager: portage-2.3.1

Signed-off-by: Patrice Clement  gentoo.org>

 net-firewall/fwknop/Manifest   |   1 -
 net-firewall/fwknop/fwknop-2.6.8-r2.ebuild | 132 -
 2 files changed, 133 deletions(-)

diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index 8e3277a..2bf90e7 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -1,2 +1 @@
-DIST fwknop-2.6.8.tar.gz 2860231 SHA256 
96e6ba8b7e29aaf65bd06eaa823896ab66169b2aaced8123375378ff4b76a2d6 SHA512 
aed4081652a95f3276468d58476d093a6dd76abbe5b4047930fc32a0d46f3dc341a3b0d9b7c81dc6c466f468f06c94607f2dadc89867127d0b4878175e32b6d6
 WHIRLPOOL 
d394b43c5eb96a4172ec005dc8ec13985e8b70bd342eabfdd95d0fd7a6425ddc294d24900f6b85b4ce7c595cf45622b28ee08583fb222c7d5d9f74f87a10c1cc
 DIST fwknop-2.6.9.tar.gz 3043542 SHA256 
0a8de8d3e2073ad08f5834d39def6c33fd035809cfddbea252174e7dc06a5a51 SHA512 
4706560d44c911c8604059d88dded9c1b8c99d90ec7dc366c0fba96c79680bdbf1b8b5e76cc34aaf3a1e58fff80db8f5f20c96d57481bdb476a9b99f4d1b
 WHIRLPOOL 
e9ac76f39f8991af4a56f85f50f2ea982a7d043cfb17c824cbaf3ebd18e34630b86abdf198e9e91239c4acf67db56539a9dee00ee379ec39314adb5bc233344c

diff --git a/net-firewall/fwknop/fwknop-2.6.8-r2.ebuild 
b/net-firewall/fwknop/fwknop-2.6.8-r2.ebuild
deleted file mode 100644
index 4a3a44c..
--- a/net-firewall/fwknop/fwknop-2.6.8-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-# 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/ https://github.com/mrash/fwknop;
-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 firewalld gdbm gpg iptables 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 )
-   python? ( ${PYTHON_DEPS} )
-   server? ( !udp-server? ( net-libs/libpcap ) )
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="
-   firewalld? ( server )
-   gdbm? ( server )
-   iptables? ( server )
-   python? ( ${PYTHON_REQUIRED_USE} )
-   server? ( ^^ ( firewalld iptables ) )
-   udp-server? ( server )
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-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 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_compile() {
-   default_src_compile
-
-   if use python; then
-   cd python || die
-   distutils-r1_src_compile
-   fi
-}
-
-src_install() {
-   default_src_install
-   prune_libtool_files --modules
-
-   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
-   

[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2016-06-20 Thread Göktürk Yüksek
commit: 8a700184a39b8704b0280c0789f9b1a8056ab988
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Mon Jun 20 20:01:46 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Tue Jun 21 01:18:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a700184

net-firewall/fwknop: respect EPREFIX in DOC_CONTENTS

Closes: https://github.com/gentoo/gentoo/pull/1703
Package-Manager: portage-2.3.0_rc1

 net-firewall/fwknop/fwknop-2.6.8-r2.ebuild | 4 ++--
 net-firewall/fwknop/fwknop-2.6.9.ebuild| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-firewall/fwknop/fwknop-2.6.8-r2.ebuild 
b/net-firewall/fwknop/fwknop-2.6.8-r2.ebuild
index 2049594..4a3a44c 100644
--- a/net-firewall/fwknop/fwknop-2.6.8-r2.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.8-r2.ebuild
@@ -48,8 +48,8 @@ DOCS=( AUTHORS ChangeLog README.md )
 
 DISABLE_AUTOFORMATTING=1
 DOC_CONTENTS="
-Example configuration files were installed to /etc/fwknopd directory.
-Please edit them to fit your needs and then remove the .example suffix.
+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

diff --git a/net-firewall/fwknop/fwknop-2.6.9.ebuild 
b/net-firewall/fwknop/fwknop-2.6.9.ebuild
index ea7cb16..09e2241 100644
--- a/net-firewall/fwknop/fwknop-2.6.9.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.9.ebuild
@@ -50,8 +50,8 @@ DOCS=( AUTHORS ChangeLog README.md )
 
 DISABLE_AUTOFORMATTING=1
 DOC_CONTENTS="
-Example configuration files were installed to /etc/fwknopd directory.
-Please edit them to fit your needs and then remove the .example suffix.
+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



[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2016-06-11 Thread Göktürk Yüksek
commit: 7b88bafebff77eeb6cde243efd3215f125e52f78
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Tue May 31 03:10:49 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Sun Jun 12 04:27:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b88bafe

net-firewall/fwknop: remove old

Package-Manager: portage-2.3.0_rc1

 net-firewall/fwknop/fwknop-2.6.8-r1.ebuild | 131 -
 1 file changed, 131 deletions(-)

diff --git a/net-firewall/fwknop/fwknop-2.6.8-r1.ebuild 
b/net-firewall/fwknop/fwknop-2.6.8-r1.ebuild
deleted file mode 100644
index f55d709..000
--- a/net-firewall/fwknop/fwknop-2.6.8-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-DISABLE_AUTOFORMATTING=1
-
-DISTUTILS_OPTIONAL=1
-# Python extension supports only Python2
-# See https://github.com/mrash/fwknop/issues/167
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools-utils eutils distutils-r1 linux-info readme.gentoo-r1 systemd
-
-DESCRIPTION="Single Packet Authorization and Port Knocking application"
-HOMEPAGE="http://www.cipherdyne.org/fwknop/ https://github.com/mrash/fwknop;
-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 firewalld gdbm gpg iptables 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 )
-   python? ( ${PYTHON_DEPS} )
-   server? ( !udp-server? ( net-libs/libpcap ) )
-"
-RDEPEND="${DEPEND}"
-
-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_CHECK"
-   ewarn "to 'N' in your fwknopd.conf file."
-   fi
-   fi
-}
-
-src_prepare() {
-   # Install example configs with .example suffix
-   if use server; then
-   sed -i -e 's/conf;/conf.example;/g' "${S}"/Makefile.am || die
-   fi
-
-   autotools-utils_src_prepare
-}
-
-src_configure() {
-   local myeconfargs=(
-   --localstatedir=/run
-   --enable-digest-cache
-   $(use_enable client)
-   $(use_enable !gdbm file-cache)
-   $(use_enable server)
-   $(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
-}
-
-src_compile() {
-   autotools-utils_src_compile
-
-   if use python; then
-   cd "${S}"/python || die
-   distutils-r1_src_compile
-   fi
-}
-
-src_install() {
-   autotools-utils_src_install
-   prune_libtool_files --modules
-
-   if use server; then
-   newinitd "${FILESDIR}/fwknopd.init" fwknopd
-   newconfd "${FILESDIR}/fwknopd.confd" fwknopd
-   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"
-
-   if use python; then
-   # Unset DOCS since distutils-r1.eclass interferes
-   local DOCS=()
-   cd "${S}"/python || die
-   distutils-r1_src_install
-   fi
-}
-
-pkg_postinst() {
-   use server && readme.gentoo_print_elog
-}



[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2016-06-11 Thread Göktürk Yüksek
commit: d53647ba0d792334773d0903d7ca70d767fced5a
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Tue May 31 03:21:39 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Sun Jun 12 04:27:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d53647ba

net-firewall/fwknop: verbump to 2.6.9

Closes: https://github.com/gentoo/gentoo/pull/1565
Package-Manager: portage-2.3.0_rc1

 net-firewall/fwknop/Manifest|   1 +
 net-firewall/fwknop/fwknop-2.6.9.ebuild | 142 
 net-firewall/fwknop/metadata.xml|   3 +-
 3 files changed, 145 insertions(+), 1 deletion(-)

diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index 7237b45..8e3277a 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -1 +1,2 @@
 DIST fwknop-2.6.8.tar.gz 2860231 SHA256 
96e6ba8b7e29aaf65bd06eaa823896ab66169b2aaced8123375378ff4b76a2d6 SHA512 
aed4081652a95f3276468d58476d093a6dd76abbe5b4047930fc32a0d46f3dc341a3b0d9b7c81dc6c466f468f06c94607f2dadc89867127d0b4878175e32b6d6
 WHIRLPOOL 
d394b43c5eb96a4172ec005dc8ec13985e8b70bd342eabfdd95d0fd7a6425ddc294d24900f6b85b4ce7c595cf45622b28ee08583fb222c7d5d9f74f87a10c1cc
+DIST fwknop-2.6.9.tar.gz 3043542 SHA256 
0a8de8d3e2073ad08f5834d39def6c33fd035809cfddbea252174e7dc06a5a51 SHA512 
4706560d44c911c8604059d88dded9c1b8c99d90ec7dc366c0fba96c79680bdbf1b8b5e76cc34aaf3a1e58fff80db8f5f20c96d57481bdb476a9b99f4d1b
 WHIRLPOOL 
e9ac76f39f8991af4a56f85f50f2ea982a7d043cfb17c824cbaf3ebd18e34630b86abdf198e9e91239c4acf67db56539a9dee00ee379ec39314adb5bc233344c

diff --git a/net-firewall/fwknop/fwknop-2.6.9.ebuild 
b/net-firewall/fwknop/fwknop-2.6.9.ebuild
new file mode 100644
index 000..ea7cb16
--- /dev/null
+++ b/net-firewall/fwknop/fwknop-2.6.9.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# 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/ https://github.com/mrash/fwknop;
+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 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="
+   firewalld? ( server )
+   gdbm? ( server )
+   iptables? ( server )
+   nfqueue? ( server )
+   python? ( ${PYTHON_REQUIRED_USE} )
+   server? ( ^^ ( firewalld iptables ) )
+   udp-server? ( server )
+"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+Example configuration files were installed to /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.
+"
+
+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_compile() {
+   default_src_compile
+
+   if use python; then
+   cd python || die
+   distutils-r1_src_compile
+   fi
+}
+
+src_install() {
+   default_src_install
+   prune_libtool_files --modules
+
+   if use extras; then
+   dodoc extras/apparmor/usr.sbin.fwknopd
+   dodoc extras/console-qr/console-qr.sh
+   dodoc extras/fwknop-launcher/*
+   fi
+
+   if 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/files/

2016-06-11 Thread Göktürk Yüksek
commit: 79579f5f468b2d633cff2236fe2a1a0afdd85ba5
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Tue May 31 03:24:40 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Sun Jun 12 04:27:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79579f5f

net-firewall/fwknop: bump initscript copyright years after shebang update

Package-Manager: portage-2.3.0_rc1

 net-firewall/fwknop/files/fwknopd.init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/fwknop/files/fwknopd.init 
b/net-firewall/fwknop/files/fwknopd.init
index a73268a..cbf6e22 100644
--- a/net-firewall/fwknop/files/fwknopd.init
+++ b/net-firewall/fwknop/files/fwknopd.init
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 



[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2016-06-11 Thread Göktürk Yüksek
commit: 3e987cd82291b3375f2b8d6c2a66d7bbbf74fbe6
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Tue May 31 03:06:45 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Sun Jun 12 04:27:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e987cd8

net-firewall/fwknop: revbump to 2.6.8-r2

Changes:
- EAPI=6;
- HTTPS in HOMEPAGE;
- update LICENSE;
- require server USE for gdbm USE as it only affects server builds;
- move kernel config check to pkg_postinst as it's purely informational;
- respect PREFIX in build system;
- avoid ${S} overuse;
- install utility scripts with extras USE;
- various cleanups here and there.

Package-Manager: portage-2.3.0_rc1

 net-firewall/fwknop/fwknop-2.6.8-r2.ebuild | 132 +
 net-firewall/fwknop/metadata.xml   |   4 +-
 2 files changed, 134 insertions(+), 2 deletions(-)

diff --git a/net-firewall/fwknop/fwknop-2.6.8-r2.ebuild 
b/net-firewall/fwknop/fwknop-2.6.8-r2.ebuild
new file mode 100644
index 000..2049594
--- /dev/null
+++ b/net-firewall/fwknop/fwknop-2.6.8-r2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# 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/ https://github.com/mrash/fwknop;
+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 firewalld gdbm gpg iptables 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 )
+   python? ( ${PYTHON_DEPS} )
+   server? ( !udp-server? ( net-libs/libpcap ) )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="
+   firewalld? ( server )
+   gdbm? ( server )
+   iptables? ( server )
+   python? ( ${PYTHON_REQUIRED_USE} )
+   server? ( ^^ ( firewalld iptables ) )
+   udp-server? ( server )
+"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+Example configuration files were installed to /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.
+"
+
+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 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_compile() {
+   default_src_compile
+
+   if use python; then
+   cd python || die
+   distutils-r1_src_compile
+   fi
+}
+
+src_install() {
+   default_src_install
+   prune_libtool_files --modules
+
+   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 extras/systemd/fwknopd.service
+   systemd_newtmpfilesd extras/systemd/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
+}
+
+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' 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2016-01-23 Thread Patrice Clement
commit: 4a739e765ad5235ae02e07ebe055bfae56d0d481
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Sat Jan 23 15:56:54 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Jan 23 15:56:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a739e76

net-firewall/fwknop: revbump to 2.6.8-r1 to adjust inherited eclasses

- Migrate to readme.gentoo-r1 eclass.
- Explicitly inherit eutils eclass since we explicitly use
  prune_libtool_files function that is provided by this eclass.

Package-Manager: portage-2.2.27

 net-firewall/fwknop/fwknop-2.6.8-r1.ebuild | 131 +
 1 file changed, 131 insertions(+)

diff --git a/net-firewall/fwknop/fwknop-2.6.8-r1.ebuild 
b/net-firewall/fwknop/fwknop-2.6.8-r1.ebuild
new file mode 100644
index 000..f55d709
--- /dev/null
+++ b/net-firewall/fwknop/fwknop-2.6.8-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+DISABLE_AUTOFORMATTING=1
+
+DISTUTILS_OPTIONAL=1
+# Python extension supports only Python2
+# See https://github.com/mrash/fwknop/issues/167
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools-utils eutils distutils-r1 linux-info readme.gentoo-r1 systemd
+
+DESCRIPTION="Single Packet Authorization and Port Knocking application"
+HOMEPAGE="http://www.cipherdyne.org/fwknop/ https://github.com/mrash/fwknop;
+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 firewalld gdbm gpg iptables 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 )
+   python? ( ${PYTHON_DEPS} )
+   server? ( !udp-server? ( net-libs/libpcap ) )
+"
+RDEPEND="${DEPEND}"
+
+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_CHECK"
+   ewarn "to 'N' in your fwknopd.conf file."
+   fi
+   fi
+}
+
+src_prepare() {
+   # Install example configs with .example suffix
+   if use server; then
+   sed -i -e 's/conf;/conf.example;/g' "${S}"/Makefile.am || die
+   fi
+
+   autotools-utils_src_prepare
+}
+
+src_configure() {
+   local myeconfargs=(
+   --localstatedir=/run
+   --enable-digest-cache
+   $(use_enable client)
+   $(use_enable !gdbm file-cache)
+   $(use_enable server)
+   $(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
+}
+
+src_compile() {
+   autotools-utils_src_compile
+
+   if use python; then
+   cd "${S}"/python || die
+   distutils-r1_src_compile
+   fi
+}
+
+src_install() {
+   autotools-utils_src_install
+   prune_libtool_files --modules
+
+   if use server; then
+   newinitd "${FILESDIR}/fwknopd.init" fwknopd
+   newconfd "${FILESDIR}/fwknopd.confd" fwknopd
+   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"
+
+   if use python; then
+   # Unset DOCS since distutils-r1.eclass interferes
+   local DOCS=()
+   cd "${S}"/python || die
+   

[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2016-01-23 Thread Patrice Clement
commit: 8468f33a4a073950700d0bba6eec0ea9802bef42
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Sat Jan 23 15:58:01 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Jan 23 15:58:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8468f33a

net-firewall/fwknop: remove old

Package-Manager: portage-2.2.27

 net-firewall/fwknop/Manifest   |   1 -
 net-firewall/fwknop/fwknop-2.6.7-r2.ebuild | 131 -
 net-firewall/fwknop/fwknop-2.6.8.ebuild| 131 -
 3 files changed, 263 deletions(-)

diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index d770956..7237b45 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -1,2 +1 @@
-DIST fwknop-2.6.7.tar.gz 2849006 SHA256 
e96c13f725a4c3829c842743b14aedf591d30570df5c06556862a900b64def86 SHA512 
8a8c5e76740c495342fd914309de564576ce5c7fda90dc0f0322782ace5f28ccbb4bcef4c0a3353a564b13ef7298a5cd75dcd4d26986b2fb5ec000b641fbf848
 WHIRLPOOL 
6de45c31cc39b7b44d0531dc19bd2727bc721cf156a04d830c295573fe40d95296c1591e3bd5ae2b597bea9a6015744061351655f1cf04a5d6a5cae6678d1126
 DIST fwknop-2.6.8.tar.gz 2860231 SHA256 
96e6ba8b7e29aaf65bd06eaa823896ab66169b2aaced8123375378ff4b76a2d6 SHA512 
aed4081652a95f3276468d58476d093a6dd76abbe5b4047930fc32a0d46f3dc341a3b0d9b7c81dc6c466f468f06c94607f2dadc89867127d0b4878175e32b6d6
 WHIRLPOOL 
d394b43c5eb96a4172ec005dc8ec13985e8b70bd342eabfdd95d0fd7a6425ddc294d24900f6b85b4ce7c595cf45622b28ee08583fb222c7d5d9f74f87a10c1cc

diff --git a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild 
b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
deleted file mode 100644
index 582a81b..000
--- a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
+++ /dev/null
@@ -1,131 +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
-DISABLE_AUTOFORMATTING=1
-
-DISTUTILS_OPTIONAL=1
-# Python extension supports only Python2
-# See https://github.com/mrash/fwknop/issues/167
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools-utils distutils-r1 linux-info readme.gentoo systemd
-
-DESCRIPTION="Single Packet Authorization and Port Knocking application"
-HOMEPAGE="http://www.cipherdyne.org/fwknop/ https://github.com/mrash/fwknop;
-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 firewalld gdbm gpg iptables 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 )
-   python? ( ${PYTHON_DEPS} )
-   server? ( !udp-server? ( net-libs/libpcap ) )
-"
-RDEPEND="${DEPEND}"
-
-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_CHECK"
-   ewarn "to 'N' in your fwknopd.conf file."
-   fi
-   fi
-}
-
-src_prepare() {
-   # Install example configs with .example suffix
-   if use server; then
-   sed -i -e 's/conf;/conf.example;/g' "${S}"/Makefile.am || die
-   fi
-
-   autotools-utils_src_prepare
-}
-
-src_configure() {
-   local myeconfargs=(
-   --localstatedir=/run
-   --enable-digest-cache
-   $(use_enable client)
-   $(use_enable !gdbm file-cache)
-   $(use_enable server)
-   $(use_enable udp-server)
-   $(use_with gpg gpgme)
-   )
-   use firewalld && myeconfargs+=(--with-firewalld=/usr/sbin/firewalld)
-   use iptables && myeconfargs+=(--with-iptables=/sbin/iptables)
-
-   

[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2015-12-24 Thread Ian Delaney
commit: 6202dcf8e261f73a44bb94ba103555c3407bcbec
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Thu Dec 24 06:16:40 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Thu Dec 24 08:31:23 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6202dcf8

net-firewall/fwknop: version bump to 2.6.8

Package-Manager: portage-2.2.24

 net-firewall/fwknop/Manifest|   1 +
 net-firewall/fwknop/fwknop-2.6.8.ebuild | 131 
 2 files changed, 132 insertions(+)

diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index 69bd5b5..d770956 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -1 +1,2 @@
 DIST fwknop-2.6.7.tar.gz 2849006 SHA256 
e96c13f725a4c3829c842743b14aedf591d30570df5c06556862a900b64def86 SHA512 
8a8c5e76740c495342fd914309de564576ce5c7fda90dc0f0322782ace5f28ccbb4bcef4c0a3353a564b13ef7298a5cd75dcd4d26986b2fb5ec000b641fbf848
 WHIRLPOOL 
6de45c31cc39b7b44d0531dc19bd2727bc721cf156a04d830c295573fe40d95296c1591e3bd5ae2b597bea9a6015744061351655f1cf04a5d6a5cae6678d1126
+DIST fwknop-2.6.8.tar.gz 2860231 SHA256 
96e6ba8b7e29aaf65bd06eaa823896ab66169b2aaced8123375378ff4b76a2d6 SHA512 
aed4081652a95f3276468d58476d093a6dd76abbe5b4047930fc32a0d46f3dc341a3b0d9b7c81dc6c466f468f06c94607f2dadc89867127d0b4878175e32b6d6
 WHIRLPOOL 
d394b43c5eb96a4172ec005dc8ec13985e8b70bd342eabfdd95d0fd7a6425ddc294d24900f6b85b4ce7c595cf45622b28ee08583fb222c7d5d9f74f87a10c1cc

diff --git a/net-firewall/fwknop/fwknop-2.6.8.ebuild 
b/net-firewall/fwknop/fwknop-2.6.8.ebuild
new file mode 100644
index 000..582a81b
--- /dev/null
+++ b/net-firewall/fwknop/fwknop-2.6.8.ebuild
@@ -0,0 +1,131 @@
+# 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
+DISABLE_AUTOFORMATTING=1
+
+DISTUTILS_OPTIONAL=1
+# Python extension supports only Python2
+# See https://github.com/mrash/fwknop/issues/167
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools-utils distutils-r1 linux-info readme.gentoo systemd
+
+DESCRIPTION="Single Packet Authorization and Port Knocking application"
+HOMEPAGE="http://www.cipherdyne.org/fwknop/ https://github.com/mrash/fwknop;
+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 firewalld gdbm gpg iptables 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 )
+   python? ( ${PYTHON_DEPS} )
+   server? ( !udp-server? ( net-libs/libpcap ) )
+"
+RDEPEND="${DEPEND}"
+
+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_CHECK"
+   ewarn "to 'N' in your fwknopd.conf file."
+   fi
+   fi
+}
+
+src_prepare() {
+   # Install example configs with .example suffix
+   if use server; then
+   sed -i -e 's/conf;/conf.example;/g' "${S}"/Makefile.am || die
+   fi
+
+   autotools-utils_src_prepare
+}
+
+src_configure() {
+   local myeconfargs=(
+   --localstatedir=/run
+   --enable-digest-cache
+   $(use_enable client)
+   $(use_enable !gdbm file-cache)
+   $(use_enable server)
+   $(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
+}
+
+src_compile() {
+   autotools-utils_src_compile
+
+   if use python; 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2015-12-21 Thread Patrice Clement
commit: 73fda1f16f2b7a5d388997dbef83f7670fc792fe
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Mon Dec 21 15:59:38 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon Dec 21 15:59:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73fda1f1

net-firewall/fwknop: re-enable in-source build wrt bug 568958

Otherwise Python C extension fails to build because it links against fko
library built during src_compile stage. With out-of-source build this library
resides in a separate directory from sources, thus it cannot be found during
Python module compilation by normal means.

This problem didn't catch my attention earlier because build failure is only
reproducible if there is no fko library installed in the system from a previous
version of this package.

Gentoo-Bug: 568958

Package-Manager: portage-2.2.24

 net-firewall/fwknop/fwknop-2.6.7-r2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild 
b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
index 50e95fe..a5bfe67 100644
--- a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
 DISABLE_AUTOFORMATTING=1
 
 DISTUTILS_OPTIONAL=1



[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2015-12-21 Thread Patrice Clement
commit: d4ae6dbb6ed499423d516e57f5e545a063f98720
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Mon Dec 21 16:14:49 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon Dec 21 16:14:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4ae6dbb

net-firewall/fwknop: do not call distutils-r1_src_prepare

Firstly, this helps to avoid potential problems with double patching
because both autotools-utils_src_prepare and distutils-r1_src_prepare
try to apply patches from PATCHES variable and call epatch_user.

Secondly, fwknop's Python module does not need any special stuff that
distutils-r1_src_prepare does. On the contrary, without extra copying
of Python files, the build is happening the way it is supported and
expected by upstream.

Package-Manager: portage-2.2.24

 net-firewall/fwknop/fwknop-2.6.7-r2.ebuild | 5 -
 1 file changed, 5 deletions(-)

diff --git a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild 
b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
index a5bfe67..582a81b 100644
--- a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
@@ -77,11 +77,6 @@ src_prepare() {
fi
 
autotools-utils_src_prepare
-
-   if use python; then
-   cd "${S}"/python || die
-   distutils-r1_src_prepare
-   fi
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/, net-firewall/fwknop/files/

2015-12-20 Thread Ian Delaney
commit: 291d0b043f537949804ecf1c2adb550d944ee405
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Mon Dec 21 02:19:24 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Mon Dec 21 02:19:24 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=291d0b04

net-firewall/fwknop: drop obsolete initscript revision suffix

Package-Manager: portage-2.2.24

 net-firewall/fwknop/files/{fwknopd.init-r1 => fwknopd.init} | 0
 net-firewall/fwknop/fwknop-2.6.7-r2.ebuild  | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/fwknop/files/fwknopd.init-r1 
b/net-firewall/fwknop/files/fwknopd.init
similarity index 100%
rename from net-firewall/fwknop/files/fwknopd.init-r1
rename to net-firewall/fwknop/files/fwknopd.init

diff --git a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild 
b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
index 46dbcae..50e95fe 100644
--- a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
@@ -113,7 +113,7 @@ src_install() {
prune_libtool_files --modules
 
if use server; then
-   newinitd "${FILESDIR}/fwknopd.init-r1" fwknopd
+   newinitd "${FILESDIR}/fwknopd.init" fwknopd
newconfd "${FILESDIR}/fwknopd.confd" fwknopd
systemd_dounit extras/systemd/fwknopd.service
systemd_newtmpfilesd extras/systemd/fwknopd.tmpfiles.conf 
fwknopd.conf



[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2015-12-20 Thread Ian Delaney
commit: 7f19537ccaf36ee22fb2164e5148dba4b9f4e6a8
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Mon Dec 21 02:15:52 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Mon Dec 21 02:15:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f19537c

net-firewall/fwknop: remove old

Package-Manager: portage-2.2.24

 net-firewall/fwknop/fwknop-2.6.7-r1.ebuild | 135 -
 1 file changed, 135 deletions(-)

diff --git a/net-firewall/fwknop/fwknop-2.6.7-r1.ebuild 
b/net-firewall/fwknop/fwknop-2.6.7-r1.ebuild
deleted file mode 100644
index 006ebd0..000
--- a/net-firewall/fwknop/fwknop-2.6.7-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-DISABLE_AUTOFORMATTING=1
-
-DISTUTILS_OPTIONAL=1
-# Python extension supports only Python2
-# See https://github.com/mrash/fwknop/issues/167
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools-utils distutils-r1 linux-info readme.gentoo systemd
-
-DESCRIPTION="Single Packet Authorization and Port Knocking application"
-HOMEPAGE="http://www.cipherdyne.org/fwknop/ https://github.com/mrash/fwknop;
-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 firewalld gdbm gpg iptables python server udp-server"
-
-RDEPEND="
-   client? ( net-misc/wget[ssl] )
-   gpg? (
-   dev-libs/libassuan
-   dev-libs/libgpg-error
-   )
-   python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-   gdbm? ( sys-libs/gdbm )
-   gpg? ( app-crypt/gpgme )
-   firewalld? ( net-firewall/firewalld[${PYTHON_USEDEP}] )
-   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_CHECK"
-   ewarn "to 'N' in your fwknopd.conf file."
-   fi
-   fi
-}
-
-src_prepare() {
-   # Install example configs with .example suffix
-   if use server; then
-   sed -i -e 's/conf;/conf.example;/g' "${S}"/Makefile.am || die
-   fi
-
-   autotools-utils_src_prepare
-
-   if use python; then
-   cd "${S}"/python || die
-   distutils-r1_src_prepare
-   fi
-}
-
-src_configure() {
-   local myeconfargs=(
-   --localstatedir=/run
-   --enable-digest-cache
-   $(use_enable client)
-   $(use_enable !gdbm file-cache)
-   $(use_enable server)
-   $(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
-}
-
-src_compile() {
-   autotools-utils_src_compile
-
-   if use python; then
-   cd "${S}"/python || die
-   distutils-r1_src_compile
-   fi
-}
-
-src_install() {
-   autotools-utils_src_install
-   prune_libtool_files --modules
-
-   if use server; then
-   newinitd "${FILESDIR}/fwknopd.init-r1" fwknopd
-   newconfd "${FILESDIR}/fwknopd.confd" fwknopd
-   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"
-
-   if use python; then
-   # Unset DOCS since distutils-r1.eclass interferes
-   local DOCS=()
-   cd "${S}"/python || die
-   distutils-r1_src_install
-   fi
-}
-
-pkg_postinst() {
-   use server && readme.gentoo_print_elog
-}



[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2015-11-26 Thread Patrice Clement
commit: 6ad2bf618716cc13e8fe1f95f8c6832d4eac6a53
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Thu Nov 26 01:37:34 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Nov 26 01:39:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ad2bf61

net-firewall/fwknop: add GitHub repo to HOMEPAGE

As cipherdyne.org tends to be down sometimes.

 net-firewall/fwknop/fwknop-2.6.7-r1.ebuild | 2 +-
 net-firewall/fwknop/fwknop-2.6.7-r2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/fwknop/fwknop-2.6.7-r1.ebuild 
b/net-firewall/fwknop/fwknop-2.6.7-r1.ebuild
index 1a798bd..006ebd0 100644
--- a/net-firewall/fwknop/fwknop-2.6.7-r1.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.7-r1.ebuild
@@ -15,7 +15,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit autotools-utils distutils-r1 linux-info readme.gentoo systemd
 
 DESCRIPTION="Single Packet Authorization and Port Knocking application"
-HOMEPAGE="http://www.cipherdyne.org/fwknop/;
+HOMEPAGE="http://www.cipherdyne.org/fwknop/ https://github.com/mrash/fwknop;
 SRC_URI="https://github.com/mrash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"

diff --git a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild 
b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
index 18c6e90..46dbcae 100644
--- a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
@@ -15,7 +15,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit autotools-utils distutils-r1 linux-info readme.gentoo systemd
 
 DESCRIPTION="Single Packet Authorization and Port Knocking application"
-HOMEPAGE="http://www.cipherdyne.org/fwknop/;
+HOMEPAGE="http://www.cipherdyne.org/fwknop/ https://github.com/mrash/fwknop;
 SRC_URI="https://github.com/mrash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"



[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/files/, net-firewall/fwknop/

2015-11-24 Thread Ian Delaney
commit: abf34ce024c176aa0bc10c0d84b0b33bc51a4c3e
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Mon Nov 23 14:26:19 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Tue Nov 24 23:27:57 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abf34ce0

net-firewall/fwknop: revbump to fix depend() and update regexps in initscript

FWKNOPD_CONFIG file should be parsed only if it exists, which is not the
case if the user has not configured fwknopd yet. See Gentoo bug #565864.

Regexps that are used to parse FWKNOPD_CONFIG file now allow spaces
before statements in order to handle possible indentation properly.

Gentoo-Bug: 565864

 net-firewall/fwknop/files/fwknopd.init-r1  |  92 
 net-firewall/fwknop/fwknop-2.6.7-r1.ebuild | 135 +
 2 files changed, 227 insertions(+)

diff --git a/net-firewall/fwknop/files/fwknopd.init-r1 
b/net-firewall/fwknop/files/fwknopd.init-r1
new file mode 100644
index 000..9e8ecdc
--- /dev/null
+++ b/net-firewall/fwknop/files/fwknopd.init-r1
@@ -0,0 +1,92 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+: ${FWKNOPD_BINARY:=/usr/sbin/fwknopd}
+: ${FWKNOPD_CONFDIR:=/etc/fwknop}
+: ${FWKNOPD_CONFIG:=${FWKNOPD_CONFDIR}/fwknopd.conf}
+: ${FWKNOPD_PIDFILE:=/run/fwknop/${SVCNAME}.pid}
+
+depend() {
+   after iptables ip6tables ebtables firewall
+   use logger
+   if [ "${rc_need+set}" = "set" ]; then
+   : # Do nothing, the user has explicitly set rc_need
+   elif [ -f "${FWKNOPD_CONFIG}" ]; then
+   local x warn_intf
+   for x in $(awk '/^[[:blank:]]*PCAP_INTF/{ sub(";$", ""); print 
$2 }' "${FWKNOPD_CONFIG}" 2>/dev/null); do
+   warn_intf="${warn_intf} ${x}"
+   done
+   if [ -n "${warn_intf}" ]; then
+   need net
+   ewarn "You are binding an interface in PCAP_INTF 
statement in your fwknopd.conf!"
+   ewarn "You must add rc_need=\"net.FOO\" to your 
/etc/conf.d/${SVCNAME},"
+   ewarn "where FOO is the following interface(s):"
+   ewarn "${warn_intf}"
+   else
+   # If PCAP_INTF and PCAP_FILE are not set, then fwknopd 
uses eth0
+   if ! grep -q '^[[:blank:]]*PCAP_FILE' 
"${FWKNOPD_CONFIG}"; then
+   need net
+   ewarn "You are not binding any interface in 
PCAP_INTF statement in your fwknopd.conf,"
+   ewarn "neither you are providing PCAP_FILE 
option. Thus fwknopd will listen on eth0."
+   ewarn "You must add rc_need=\"net.eth0\" to 
your /etc/conf.d/${SVCNAME}."
+   fi
+   fi
+   fi
+}
+
+checkconfig() {
+   if [ ! -e "${FWKNOPD_CONFDIR}"/fwknopd.conf ]; then
+   eerror "You need ${FWKNOPD_CONFDIR}/fwknopd.conf file to run 
fwknopd"
+   eerror "Example is located at /etc/fwknop/fwknopd.conf.example"
+   return 1
+   fi
+
+   if [ ! -e "${FWKNOPD_CONFDIR}"/access.conf ]; then
+   eerror "You need ${FWKNOPD_CONFDIR}/access.conf file to run 
fwknopd"
+   eerror "Example is located at /etc/fwknop/access.conf.example"
+   return 1
+   fi
+
+   [ "${FWKNOPD_PIDFILE}" != "/run/fwknop/${SVCNAME}.pid" ] \
+   && FWKNOPD_OPTS="${FWKNOPD_OPTS} --pid-file=${FWKNOPD_PIDFILE}"
+
+   [ "${FWKNOPD_CONFDIR}" != "/etc/fwknop" ] \
+   && FWKNOPD_OPTS="${FWKNOPD_OPTS} \
+   --config=${FWKNOPD_CONFDIR}/fwknopd.conf \
+   --access-file=${FWKNOPD_CONFDIR}/access.conf"
+
+   return 0
+}
+
+start() {
+   checkconfig || return 1
+
+   ebegin "Starting ${SVCNAME}"
+   start-stop-daemon --start \
+   --exec ${FWKNOPD_BINARY} --pidfile ${FWKNOPD_PIDFILE} \
+   -- ${FWKNOPD_OPTS}
+   eend $?
+}
+
+stop() {
+   if [ "${RC_CMD}" = "restart" ]; then
+   checkconfig || return 1
+   fi
+
+   ebegin "Stopping ${SVCNAME}"
+   start-stop-daemon --stop --pidfile ${FWKNOPD_PIDFILE}
+   eend $?
+}
+
+reload() {
+   checkconfig || return 1
+
+   ebegin "Reloading ${SVCNAME} configuration"
+   start-stop-daemon --signal HUP --pidfile ${FWKNOPD_PIDFILE}
+   eend $?
+}

diff --git a/net-firewall/fwknop/fwknop-2.6.7-r1.ebuild 
b/net-firewall/fwknop/fwknop-2.6.7-r1.ebuild
new file mode 100644
index 000..1a798bd
--- /dev/null
+++ b/net-firewall/fwknop/fwknop-2.6.7-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1

[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/, net-firewall/fwknop/files/

2015-11-24 Thread Ian Delaney
commit: e7fbae855a57b354bc05bf6efa507474c8e8bc1a
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Mon Nov 23 15:08:31 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Tue Nov 24 23:28:02 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7fbae85

net-firewall/fwknop: remove old

 net-firewall/fwknop/files/fwknopd.init  |  92 --
 net-firewall/fwknop/fwknop-2.6.7.ebuild | 135 
 2 files changed, 227 deletions(-)

diff --git a/net-firewall/fwknop/files/fwknopd.init 
b/net-firewall/fwknop/files/fwknopd.init
deleted file mode 100644
index 232e1fc..000
--- a/net-firewall/fwknop/files/fwknopd.init
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-: ${FWKNOPD_BINARY:=/usr/sbin/fwknopd}
-: ${FWKNOPD_CONFDIR:=/etc/fwknop}
-: ${FWKNOPD_CONFIG:=${FWKNOPD_CONFDIR}/fwknopd.conf}
-: ${FWKNOPD_PIDFILE:=/run/fwknop/${SVCNAME}.pid}
-
-depend() {
-   after iptables ip6tables ebtables firewall
-   use logger
-   if [ "${rc_need+set}" = "set" ]; then
-   : # Do nothing, the user has explicitly set rc_need
-   else
-   local x warn_intf
-   for x in $(awk '/^PCAP_INTF/{ sub(";$", ""); print $2 }' 
"${FWKNOPD_CONFIG}" 2>/dev/null); do
-   warn_intf="${warn_intf} ${x}"
-   done
-   if [ -n "${warn_intf}" ]; then
-   need net
-   ewarn "You are binding an interface in PCAP_INTF 
statement in your fwknopd.conf!"
-   ewarn "You must add rc_need=\"net.FOO\" to your 
/etc/conf.d/${SVCNAME},"
-   ewarn "where FOO is the following interface(s):"
-   ewarn "${warn_intf}"
-   else
-   # if PCAP_INTF and PCAP_FILE are not set, then fwknopd 
uses eth0
-   if ! grep -q '^PCAP_FILE' "${FWKNOPD_CONFIG}"; then
-   need net
-   ewarn "You are not binding any interface in 
PCAP_INTF statement in your fwknopd.conf,"
-   ewarn "neither you are providing PCAP_FILE 
option. Thus fwknopd will listen on eth0."
-   ewarn "You must add rc_need=\"net.eth0\" to 
your /etc/conf.d/${SVCNAME}."
-   fi
-   fi
-   fi
-}
-
-checkconfig() {
-   if [ ! -e "${FWKNOPD_CONFDIR}"/fwknopd.conf ]; then
-   eerror "You need ${FWKNOPD_CONFDIR}/fwknopd.conf file to run 
fwknopd"
-   eerror "Example is located at /etc/fwknop/fwknopd.conf.example"
-   return 1
-   fi
-
-   if [ ! -e "${FWKNOPD_CONFDIR}"/access.conf ]; then
-   eerror "You need ${FWKNOPD_CONFDIR}/access.conf file to run 
fwknopd"
-   eerror "Example is located at /etc/fwknop/access.conf.example"
-   return 1
-   fi
-
-   [ "${FWKNOPD_PIDFILE}" != "/run/fwknop/${SVCNAME}.pid" ] \
-   && FWKNOPD_OPTS="${FWKNOPD_OPTS} --pid-file=${FWKNOPD_PIDFILE}"
-
-   [ "${FWKNOPD_CONFDIR}" != "/etc/fwknop" ] \
-   && FWKNOPD_OPTS="${FWKNOPD_OPTS} \
-   --config=${FWKNOPD_CONFDIR}/fwknopd.conf \
-   --access-file=${FWKNOPD_CONFDIR}/access.conf"
-
-   return 0
-}
-
-start() {
-   checkconfig || return 1
-
-   ebegin "Starting ${SVCNAME}"
-   start-stop-daemon --start \
-   --exec ${FWKNOPD_BINARY} --pidfile ${FWKNOPD_PIDFILE} \
-   -- ${FWKNOPD_OPTS}
-   eend $?
-}
-
-stop() {
-   if [ "${RC_CMD}" = "restart" ]; then
-   checkconfig || return 1
-   fi
-
-   ebegin "Stopping ${SVCNAME}"
-   start-stop-daemon --stop --pidfile ${FWKNOPD_PIDFILE}
-   eend $?
-}
-
-reload() {
-   checkconfig || return 1
-
-   ebegin "Reloading ${SVCNAME} configuration"
-   start-stop-daemon --signal HUP --pidfile ${FWKNOPD_PIDFILE}
-   eend $?
-}

diff --git a/net-firewall/fwknop/fwknop-2.6.7.ebuild 
b/net-firewall/fwknop/fwknop-2.6.7.ebuild
deleted file mode 100644
index bbad392..000
--- a/net-firewall/fwknop/fwknop-2.6.7.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-DISABLE_AUTOFORMATTING=1
-
-DISTUTILS_OPTIONAL=1
-# Python extension supports only Python2
-# See https://github.com/mrash/fwknop/issues/167
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools-utils distutils-r1 linux-info readme.gentoo systemd
-
-DESCRIPTION="Single Packet Authorization and Port Knocking application"
-HOMEPAGE="http://www.cipherdyne.org/fwknop/;
-SRC_URI="https://github.com/mrash/${PN}/archive/${PV}.tar.gz 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2015-11-24 Thread Ian Delaney
commit: 9a3d9e47d56420e690772dba7a915fb019e07bf3
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Mon Nov 23 13:05:20 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Tue Nov 24 23:27:47 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a3d9e47

net-firewall/fwknop: enable out-of-source build

 net-firewall/fwknop/fwknop-2.6.7.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-firewall/fwknop/fwknop-2.6.7.ebuild 
b/net-firewall/fwknop/fwknop-2.6.7.ebuild
index 2fc149f..bbad392 100644
--- a/net-firewall/fwknop/fwknop-2.6.7.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.7.ebuild
@@ -4,13 +4,13 @@
 
 EAPI=5
 
+AUTOTOOLS_AUTORECONF=1
+DISABLE_AUTOFORMATTING=1
+
+DISTUTILS_OPTIONAL=1
 # Python extension supports only Python2
 # See https://github.com/mrash/fwknop/issues/167
 PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-DISABLE_AUTOFORMATTING=1
 
 inherit autotools-utils distutils-r1 linux-info readme.gentoo systemd
 



[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2015-11-24 Thread Ian Delaney
commit: d7ffdfbff01fcb89fda56483b488c325fd23aa36
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Mon Nov 23 14:42:59 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Tue Nov 24 23:28:00 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7ffdfbf

net-firewall/fwknop: revbump to 2.6.7-r2 in order to fix dependencies

Separate RDEPEND and DEPEND properly.

 net-firewall/fwknop/fwknop-2.6.7-r2.ebuild | 135 +
 1 file changed, 135 insertions(+)

diff --git a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild 
b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
new file mode 100644
index 000..18c6e90
--- /dev/null
+++ b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+DISABLE_AUTOFORMATTING=1
+
+DISTUTILS_OPTIONAL=1
+# Python extension supports only Python2
+# See https://github.com/mrash/fwknop/issues/167
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools-utils distutils-r1 linux-info readme.gentoo systemd
+
+DESCRIPTION="Single Packet Authorization and Port Knocking application"
+HOMEPAGE="http://www.cipherdyne.org/fwknop/;
+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 firewalld gdbm gpg iptables 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 )
+   python? ( ${PYTHON_DEPS} )
+   server? ( !udp-server? ( net-libs/libpcap ) )
+"
+RDEPEND="${DEPEND}"
+
+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_CHECK"
+   ewarn "to 'N' in your fwknopd.conf file."
+   fi
+   fi
+}
+
+src_prepare() {
+   # Install example configs with .example suffix
+   if use server; then
+   sed -i -e 's/conf;/conf.example;/g' "${S}"/Makefile.am || die
+   fi
+
+   autotools-utils_src_prepare
+
+   if use python; then
+   cd "${S}"/python || die
+   distutils-r1_src_prepare
+   fi
+}
+
+src_configure() {
+   local myeconfargs=(
+   --localstatedir=/run
+   --enable-digest-cache
+   $(use_enable client)
+   $(use_enable !gdbm file-cache)
+   $(use_enable server)
+   $(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
+}
+
+src_compile() {
+   autotools-utils_src_compile
+
+   if use python; then
+   cd "${S}"/python || die
+   distutils-r1_src_compile
+   fi
+}
+
+src_install() {
+   autotools-utils_src_install
+   prune_libtool_files --modules
+
+   if use server; then
+   newinitd "${FILESDIR}/fwknopd.init-r1" fwknopd
+   newconfd "${FILESDIR}/fwknopd.confd" fwknopd
+   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"
+
+   if use python; then
+   # Unset DOCS since distutils-r1.eclass interferes
+   local DOCS=()
+   cd "${S}"/python || die
+   distutils-r1_src_install
+   fi
+}
+
+pkg_postinst() {
+   use server && readme.gentoo_print_elog

[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2015-10-31 Thread Ian Delaney
commit: 82b853e9613589fa0a76a44822bb68a5d9c3acdc
Author: Ian Delaney  gentoo  org>
AuthorDate: Sat Oct 31 06:04:04 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sat Oct 31 09:36:06 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82b853e9

net-firewall/fwknop: metadata.xml: update maintainer's email address

Package-Manager: portage-2.2.23

 net-firewall/fwknop/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/fwknop/metadata.xml b/net-firewall/fwknop/metadata.xml
index 8b1bce7..cc8a621 100644
--- a/net-firewall/fwknop/metadata.xml
+++ b/net-firewall/fwknop/metadata.xml
@@ -3,7 +3,7 @@
 
proxy-maintainers

-   itumay...@gmail.com
+   itumaykin+gen...@gmail.com
Coacher





[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/

2015-09-05 Thread Ian Delaney
commit: 048d03cc31f4f5c326384bbb6920b1491a179539
Author: Ian Delaney  gentoo  org>
AuthorDate: Sat Sep  5 14:42:38 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sat Sep  5 14:43:59 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=048d03cc

net-firewall/fwknop: bump: new optional deps with use flags

dep net-firewall/firewalld is masked under profiles for SElinux,
the use flag firewalld has been masked accordingly under profiles,
patches and ebuild supplied by maintainer via bug #558754,
prior version dropped, closes said bug

Package-Manager: portage-2.2.20

 net-firewall/fwknop/Manifest   |  2 +-
 ...{fwknop-2.6.6-r1.ebuild => fwknop-2.6.7.ebuild} | 54 +-
 net-firewall/fwknop/metadata.xml   |  8 ++--
 3 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index ae32b6f..69bd5b5 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -1 +1 @@
-DIST fwknop-2.6.6.tar.gz 2433846 SHA256 
724e986b6bc47d3b6f5ba5c9232e2b411ae8ef4b2e8f7fffd16210c20d3be932 SHA512 
ccd25701908a1bc653b59571013f0953ee40c967537b68cfaff48e1eea4fde11402712f70f07db308f7a37cfd49ef8ad11b1535d3012cf32e09cc677673c067f
 WHIRLPOOL 
df8025e8a2551e0485473715bc10fef31b373f38293b8f8f678aa7ec03f9fbe353a089cfbdbb783e5972b917313f4a90edfac4557e53bd962df6d8ba0e9fca2e
+DIST fwknop-2.6.7.tar.gz 2849006 SHA256 
e96c13f725a4c3829c842743b14aedf591d30570df5c06556862a900b64def86 SHA512 
8a8c5e76740c495342fd914309de564576ce5c7fda90dc0f0322782ace5f28ccbb4bcef4c0a3353a564b13ef7298a5cd75dcd4d26986b2fb5ec000b641fbf848
 WHIRLPOOL 
6de45c31cc39b7b44d0531dc19bd2727bc721cf156a04d830c295573fe40d95296c1591e3bd5ae2b597bea9a6015744061351655f1cf04a5d6a5cae6678d1126

diff --git a/net-firewall/fwknop/fwknop-2.6.6-r1.ebuild 
b/net-firewall/fwknop/fwknop-2.6.7.ebuild
similarity index 50%
rename from net-firewall/fwknop/fwknop-2.6.6-r1.ebuild
rename to net-firewall/fwknop/fwknop-2.6.7.ebuild
index 7fcc35d..2fc149f 100644
--- a/net-firewall/fwknop/fwknop-2.6.6-r1.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.7.ebuild
@@ -4,15 +4,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
+# Python extension supports only Python2
+# See 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 +21,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,23 +34,45 @@ RDEPEND="
 DEPEND="${RDEPEND}
gdbm? ( sys-libs/gdbm )
gpg? ( app-crypt/gpgme )
-   server? (
-   !udp-server? ( net-libs/libpcap )
-   net-firewall/iptables
-   )
+   firewalld? ( net-firewall/firewalld[${PYTHON_USEDEP}] )
+   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_CHECK"
+   ewarn "to 'N' in your fwknopd.conf file."
+   fi
+   fi
+}
 
 src_prepare() {
# Install example configs with .example suffix
if use server; then
-   sed -i 's/conf;/conf.example;/g' "${S}"/Makefile.am || die
+   sed -i -e