gentoo resync : 06.08.2019

3 files changed, 3 insertions, 106 deletions

diff --git a/net-firewall/nufw/Manifest b/net-firewall/nufw/Manifest
index ddb4fc5e2e3d..7c9d0f981a1d 100644
--- a/net-firewall/nufw/Manifest
+++ b/net-firewall/nufw/Manifest
@@ -5,6 +5,5 @@ AUX nufw-2.2.22-var-run.patch 1438 BLAKE2B 259d96d3a7386ac30f4ca7a88ecb0a4714b04
 AUX nufw-conf.d 122 BLAKE2B 3263b28a9a783f35920a30cb022fe86b8a0fdc05b45c5a191e53c0b201ca38da9fe9eeda82866cf69dc760e0ff2fcd0264ee17f53f03a6077b63d9fcbd2dd1f0 SHA512 df48fc1843bf07e7ccfacd647caafc43752fdfa76da09a89d9ec0d76b79746c60c70f68c004c7e37899f195ae63adefc7d1c1b2c7b41da27911eb4cdc54212fb
 AUX nufw-init.d 273 BLAKE2B 00827d4cf93b484c6563b7bccc4020e9de0e8f2652eb29f9b1a64dfb4333b7e04b370f977a43a8f9af4b680d62e658a7779822c6671059e83a5ceea7f1872f5e SHA512 7f8b16532ae74b6aae8a9c7ef4a7509b66253f03a47c8ee521163a35db525e8c25b091289e10337307906a27e0aba558bd2a28dc0b91cbc09ce17ba78002d0e1
 DIST nufw-2.2.22.tar.bz2 597491 BLAKE2B 4c3092aeaced237ceb9faa16cff275938de23cdca31d2d6f6406238a0fe75ad15468f91a80b1d6e0bfc6dac520b6331ee19a1d95a006d591b891b91aad6caa8b SHA512 cc9f43b9ebf6aabbab4c83799ca1735fc456c085959cfb24d17571302c71518660424195b2cc62ed615f811bd6b3c45e1b99db99138d1caa6a744370775acaee
-EBUILD nufw-2.2.22-r1.ebuild 2631 BLAKE2B 731d7f4c0b9d61809d5e4100fb47c9619d0fdad47b2af596740ff3b4f7cbd94158cdc27a930d4d35ae9029f06a4bfdd5b0d42915fdfa989edca4b784abd613d7 SHA512 45e1cbc6deb24861633753cc268090bb4e21f6cd85aed8f1abae2f6aec1d7523dd1ce92043d60cb4229894577b9f0d34fad4ecbf2b5e7dffd7461a3f0b700bb0
-EBUILD nufw-2.2.22-r2.ebuild 2642 BLAKE2B bb9629295235b2a7cfaf184b67b4122cbedc45ea61e6ef7964c277f579ba3d2e0bf61050f30aa9462c82bad399a49330ea5cbdb504c4762d7128ddc6dacda641 SHA512 8afdeab8d1794994a3f398ea4a741369752c52346cd1693978fc48f98b3798b180bea2fa66a7f94614e23067171742e3a3f10e4cb4edef3fa742825b867560fd
+EBUILD nufw-2.2.22-r3.ebuild 2650 BLAKE2B 1a22d6dc4bb32d595d147d8b7f739d9bf21658df7e7befda1157008a0841c25b1f864671d0c4a9662f9aefebafea82cbd445ab98399a016c6522ed361762abb2 SHA512 0593a072ba72284ffdce5c591dda4adb17f24842ff42d2021218140b5fe2e4abf910d707afb8ddd974d67eda856d686e3e6e198ab4b0ca5268866e2aae9ee3a5
 MISC metadata.xml 547 BLAKE2B 58719a0151213d5a4f796870fdb9360ae67d7d6b7e3672d9e685149c7561604e92f293391813b502f932c94ea76fc2a3b6fd089725d33471a57318e5978a7e8c SHA512 29dea30db4101530fc810fd162a93aa7f87898f57a955f528a9259918a4a9c1d16dc1b7a790817846482b410a11e98f32987d409165a322fdfc8352bfd5383d5
diff --git a/net-firewall/nufw/nufw-2.2.22-r1.ebuild b/net-firewall/nufw/nufw-2.2.22-r1.ebuild
deleted file mode 100644
index 79f0b9290942..000000000000
--- a/net-firewall/nufw/nufw-2.2.22-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SSL_CERT_MANDATORY=1
-inherit autotools eutils multilib pam ssl-cert
-
-DESCRIPTION="An enterprise grade authenticating firewall based on netfilter"
-HOMEPAGE="http://www.nufw.org/"
-SRC_URI="http://www.nufw.org/attachments/download/39/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="debug ldap mysql pam pam_nuauth plaintext postgres prelude unicode nfqueue nfconntrack static syslog test"
-
-REQUIRED_USE="pam_nuauth? ( plaintext )"
-DEPEND="
-	dev-libs/cyrus-sasl
-	dev-libs/glib:2
-	dev-libs/libgcrypt:0
-	dev-python/ipy
-	net-firewall/iptables
-	net-libs/gnutls
-	ldap? ( >=net-nds/openldap-2 )
-	mysql? ( virtual/mysql )
-	nfconntrack? ( net-libs/libnetfilter_conntrack )
-	nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue )
-	pam? ( sys-libs/pam )
-	pam_nuauth? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql[server] )
-	prelude? ( dev-libs/libprelude )
-"
-RDEPEND=${DEPEND}
-
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-var-run.patch
-	sed -i \
-		-e 's:^#\(nuauth_tls_key="/etc/nufw/\)nuauth-key.pem:\1nuauth.key:' \
-		-e 's:^#\(nuauth_tls_cert="/etc/nufw/\)nuauth-cert.pem:\1nuauth.pem:' \
-		conf/nuauth.conf || die
-	sed -i \
-		-e "/^modulesdir/s|=.*|= /$(get_libdir)/security|g" \
-		src/clients/pam_nufw/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable pam_nuauth pam-nufw) \
-		$(use_enable static) \
-		$(use_with ldap) \
-		$(use_with mysql mysql-auth) \
-		$(use_with mysql mysql-log) \
-		$(use_with nfconntrack) \
-		$(use_with nfqueue) \
-		$(use_with pam system-auth) \
-		$(use_with plaintext plaintext-auth) \
-		$(use_with postgres pgsql-log) \
-		$(use_with prelude prelude-log) \
-		$(use_with syslog syslog-log) \
-		$(use_with unicode utf8) \
-		--enable-shared \
-		--includedir="/usr/include/nufw" \
-		--localstatedir="/var" \
-		--sysconfdir="/etc/nufw" \
-		--with-mark-group \
-		--with-user-mark
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/nufw-init.d nufw
-	newconfd "${FILESDIR}"/nufw-conf.d nufw
-
-	newinitd "${FILESDIR}"/nuauth-init.d nuauth
-	newconfd "${FILESDIR}"/nuauth-conf.d nuauth
-
-	insinto /etc/nufw
-	doins conf/nuauth.conf
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	docinto scripts
-	dodoc scripts/{clean_conntrack.pl,nuaclgen,nutop,README,ulog_rotate_daily.sh,ulog_rotate_weekly.sh}
-	docinto conf
-	dodoc conf/*.{nufw,schema,conf,dump,xml}
-
-	if use pam; then
-		pamd_mimic system-auth nufw auth account password session
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	install_cert /etc/nufw/{nufw,nuauth}
-}
diff --git a/net-firewall/nufw/nufw-2.2.22-r2.ebuild b/net-firewall/nufw/nufw-2.2.22-r3.ebuild
index a3c6d2b4f822..ec1f263bec86 100644
--- a/net-firewall/nufw/nufw-2.2.22-r2.ebuild
+++ b/net-firewall/nufw/nufw-2.2.22-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ DEPEND="
 	net-firewall/iptables
 	net-libs/gnutls
 	ldap? ( >=net-nds/openldap-2 )
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c )
 	nfconntrack? ( net-libs/libnetfilter_conntrack )
 	nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue )
 	pam? ( sys-libs/pam )