[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-pf/, sys-freebsd/freebsd-pf/files/, profiles/

[Michał Górny]

commit:     803eb8f62a018139ed263dd54132a732b2a9abef
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 15:13:59 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 15:16:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=803eb8f6

sys-freebsd/freebsd-pf: Remove last-rited pkg

Closes: https://bugs.gentoo.org/683284
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 profiles/package.mask                              |  1 -
 sys-freebsd/freebsd-pf/Manifest                    |  1 -
 .../files/freebsd-pf-11.1-libevent.patch           | 13 ----
 .../freebsd-pf/files/freebsd-pf-11.1-pflogd.patch  | 14 -----
 .../freebsd-pf/files/freebsd-pf-9.0-bpf.patch      | 10 ----
 .../files/freebsd-pf-9.0-pcap_pollution.patch      | 17 ------
 sys-freebsd/freebsd-pf/files/pf.confd              |  9 ---
 sys-freebsd/freebsd-pf/files/pf.initd              | 49 ---------------
 sys-freebsd/freebsd-pf/freebsd-pf-11.1.ebuild      | 70 ----------------------
 sys-freebsd/freebsd-pf/metadata.xml                |  8 ---
 10 files changed, 192 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index d6d415bd668..a0601770af5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -754,7 +754,6 @@ sys-freebsd/freebsd-lib
 sys-freebsd/freebsd-libexec
 sys-freebsd/freebsd-mk-defs
 sys-freebsd/freebsd-pam-modules
-sys-freebsd/freebsd-pf
 
 # Lars Wendler <polynomial-c@g.o> (2019-09-04)
 # Unofficial build. Superseded by official 2.49.5 release.

diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest
deleted file mode 100644
index f3dcd89d595..00000000000
--- a/sys-freebsd/freebsd-pf/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca

diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-11.1-libevent.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-11.1-libevent.patch
deleted file mode 100644
index 057088f3298..00000000000
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-11.1-libevent.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/usr.sbin/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/Makefile
-index 3708edc..efdfcc6 100644
---- a/usr.sbin/ftp-proxy/Makefile
-+++ b/usr.sbin/ftp-proxy/Makefile
-@@ -7,8 +7,6 @@ MAN=	ftp-proxy.8
- 
- SRCS=	ftp-proxy.c filter.c
- 
--CFLAGS+=-I${SRCTOP}/contrib/pf/libevent
--
- LIBADD=	event
- 
- WARNS?=	3

diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-11.1-pflogd.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-11.1-pflogd.patch
deleted file mode 100644
index a10e21dd19c..00000000000
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-11.1-pflogd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile
-index f9d47da..bb00d39 100644
---- a/sbin/pflogd/Makefile
-+++ b/sbin/pflogd/Makefile
-@@ -7,9 +7,6 @@ PROG=	pflogd
- SRCS= 	pflogd.c pidfile.c privsep.c privsep_fdpass.c
- MAN=	pflogd.8
- 
--CFLAGS+=-include ${SRCTOP}/lib/libpcap/config.h
--CFLAGS+=-I${.CURDIR}/../../contrib/libpcap
--
- LIBADD=	pcap
- 
- WARNS?=	2

diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-bpf.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-bpf.patch
deleted file mode 100644
index fb3c7012ecc..00000000000
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-bpf.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- contrib/pf/pflogd/pflogd.c.old	2011-11-02 21:12:57.000000000 +0000
-+++ contrib/pf/pflogd/pflogd.c	2011-11-02 21:13:11.000000000 +0000
-@@ -39,6 +39,7 @@
- #include <sys/stat.h>
- #include <sys/socket.h>
- #include <net/if.h>
-+#include <net/bpf.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>

diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pcap_pollution.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pcap_pollution.patch
deleted file mode 100644
index 184ab6f31bc..00000000000
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pcap_pollution.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- contrib/pf/pflogd/privsep.c.old	2011-11-02 21:04:01.000000000 +0000
-+++ contrib/pf/pflogd/privsep.c	2011-11-02 21:04:27.000000000 +0000
-@@ -32,11 +32,13 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <limits.h>
-+#include <stdio.h>
-+#define HAVE_SNPRINTF
-+#define HAVE_STRLCPY
- #include <pcap.h>
- #include <pcap-int.h>
- #include <pwd.h>
- #include <signal.h>
--#include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <syslog.h>

diff --git a/sys-freebsd/freebsd-pf/files/pf.confd b/sys-freebsd/freebsd-pf/files/pf.confd
deleted file mode 100644
index 87c21b281e2..00000000000
--- a/sys-freebsd/freebsd-pf/files/pf.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Defines where the rules file is found, by default /etc/pf.conf
-# pf_conf=/etc/pf.conf
-
-# Extra options to pass to pfctl when loading the rules
-# See pfctl(8)
-# pf_args=

diff --git a/sys-freebsd/freebsd-pf/files/pf.initd b/sys-freebsd/freebsd-pf/files/pf.initd
deleted file mode 100644
index c1b3e9eb574..00000000000
--- a/sys-freebsd/freebsd-pf/files/pf.initd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if ! [ -c /dev/pf ]; then
-		ewarn "Pseudo-device /dev/pf not found."
-	
-		ebegin "Loading pf module"
-		if ! kldload pf; then
-			eerror "Unable to load pf module."
-			eend 1
-			return 1
-		fi
-		eend $?
-
-		if ! [ -c /dev/pf ]; then
-			eerror "Pseudo-device /dev/pf still not found."
-			return 1
-		fi
-	fi
-
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	einfo "Starting firewall"
-	
-	if [ -r "${PF_RULES_FILE}" ]; then
-		einfo "Loading firewall rules"
-		/sbin/pfctl -qe -f ${PF_RULES_FILE:-/etc/pf.conf} ${PF_OPTS}
-	else
-		/sbin/pfctl -qe ${PF_OPTS}
-	fi
-	
-	eend $?
-}
-
-stop() {
-	einfo "Stopping firewall"
-	/sbin/pfctl -qd || retval=1
-	eend $?
-}

diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-11.1.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-11.1.ebuild
deleted file mode 100644
index a210e789bf4..00000000000
--- a/sys-freebsd/freebsd-pf/freebsd-pf-11.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd user
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-
-IUSE=""
-
-# Crypto is needed to have an internal OpenSSL header
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	usr.sbin/
-	sbin/
-	contrib/pf/
-	etc/
-"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-	dev-libs/libevent
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S="${WORKDIR}"
-
-SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd usr.sbin/ftp-proxy"
-
-pkg_setup() {
-	enewgroup authpf 63
-}
-
-src_prepare() {
-	# pcap-int.h redefines snprintf as pcap_snprintf
-	epatch "${FILESDIR}/${PN}-9.0-pcap_pollution.patch"
-	# Use system's libevent
-	epatch "${FILESDIR}/${PN}-11.1-libevent.patch"
-	epatch "${FILESDIR}/${PN}-11.1-pflogd.patch"
-	epatch "${FILESDIR}/${PN}-9.0-bpf.patch"
-	# Link in kernel sources
-	[[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys"
-}
-
-src_compile() {
-	for dir in ${SUBDIRS}; do
-		einfo "Starting make in ${dir}"
-		cd "${S}/${dir}" || die
-		freebsd_src_compile || die "Make ${dir} failed"
-	done
-}
-
-src_install() {
-	for dir in ${SUBDIRS}; do
-		einfo "Starting install in ${dir}"
-		cd "${S}/${dir}" || die
-		freebsd_src_install || die "Install ${dir} failed"
-	done
-
-	cd "${WORKDIR}"/etc
-	insinto /etc
-	doins pf.os
-	# pf.initd provided by openrc, but no pf.confd
-	newconfd "${FILESDIR}/pf.confd" pf
-}

diff --git a/sys-freebsd/freebsd-pf/metadata.xml b/sys-freebsd/freebsd-pf/metadata.xml
deleted file mode 100644
index a00f3aeb1f8..00000000000
--- a/sys-freebsd/freebsd-pf/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>bsd@g.o</email>
-	<name>BSD Project</name>
-</maintainer>
-</pkgmetadata>