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

[Michał Górny]

commit:     032e5b66d1af5c043a92e8f0d9ee44744586218e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 15:11:52 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 15:16:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=032e5b66

sys-freebsd/freebsd-sbin: 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-sbin/Manifest                  |   1 -
 sys-freebsd/freebsd-sbin/files/adjkerntz-crontab   |   4 -
 .../files/freebsd-sbin-10.0-zlib.patch             |  22 -----
 .../files/freebsd-sbin-6.1-pr102701.patch          |  17 ----
 .../files/freebsd-sbin-6.2-ldconfig.patch          |  13 ---
 .../freebsd-sbin/files/freebsd-sbin-setXid.patch   |  20 ----
 sys-freebsd/freebsd-sbin/freebsd-sbin-11.1.ebuild  | 102 ---------------------
 sys-freebsd/freebsd-sbin/metadata.xml              |  21 -----
 9 files changed, 201 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index b0be810d41b..b6e6f7d9129 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -757,7 +757,6 @@ sys-freebsd/freebsd-mk-defs
 sys-freebsd/freebsd-pam-modules
 sys-freebsd/freebsd-pf
 sys-freebsd/freebsd-rescue
-sys-freebsd/freebsd-sbin
 sys-freebsd/freebsd-share
 sys-freebsd/freebsd-sources
 

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

diff --git a/sys-freebsd/freebsd-sbin/files/adjkerntz-crontab b/sys-freebsd/freebsd-sbin/files/adjkerntz-crontab
deleted file mode 100644
index 5fc46f5bf48..00000000000
--- a/sys-freebsd/freebsd-sbin/files/adjkerntz-crontab
+++ /dev/null
@@ -1,4 +0,0 @@
-# Adjust the time zone if the CMOS clock keeps local time, as opposed to
-# UTC time.  See adjkerntz(8) for details.
-1,31    0-5     *       *       *       root    /sbin/adjkerntz -a
-

diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-10.0-zlib.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-10.0-zlib.patch
deleted file mode 100644
index c0a2bf923c2..00000000000
--- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-10.0-zlib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
-index bdbf7e3..a4c67ec 100644
---- a/sbin/savecore/savecore.c
-+++ b/sbin/savecore/savecore.c
-@@ -92,7 +92,7 @@ static int checkfor, compress, clear, force, keep, verbose;	/* flags */
- static int nfound, nsaved, nerr;			/* statistics */
- static int maxdumps;
- 
--extern FILE *zopen(const char *, const char *);
-+extern FILE *gzopen(const char *, const char *);
- 
- static sig_atomic_t got_siginfo;
- static void infohandler(int);
-@@ -626,7 +626,7 @@ DoFile(const char *savedir, const char *device)
- 	if (compress) {
- 		snprintf(corename, sizeof(corename), "%s.%d.gz",
- 		    istextdump ? "textdump.tar" : "vmcore", bounds);
--		fp = zopen(corename, "w");
-+		fp = gzopen(corename, "w");
- 	} else {
- 		snprintf(corename, sizeof(corename), "%s.%d",
- 		    istextdump ? "textdump.tar" : "vmcore", bounds);

diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.1-pr102701.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.1-pr102701.patch
deleted file mode 100644
index 7b9578c40c8..00000000000
--- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.1-pr102701.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Solves the issue reported in Problem Report bin/102701.
-
-Can't delete an inet6 alias address from an interface.
-
-Index: fbsd-6.1/sbin/ifconfig/af_inet6.c
-===================================================================
---- fbsd-6.1.orig/sbin/ifconfig/af_inet6.c
-+++ fbsd-6.1/sbin/ifconfig/af_inet6.c
-@@ -515,7 +515,7 @@ static struct afswtch af_inet6 = {
- 	.af_settunnel	= in6_set_tunnel,
- 	.af_difaddr	= SIOCDIFADDR_IN6,
- 	.af_aifaddr	= SIOCAIFADDR_IN6,
--	.af_ridreq	= &in6_addreq,
-+	.af_ridreq	= &in6_ridreq,
- 	.af_addreq	= &in6_addreq,
- };
- 

diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ldconfig.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ldconfig.patch
deleted file mode 100644
index 81ad0246168..00000000000
--- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ldconfig.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur sbin.orig/ldconfig/elfhints.c sbin/ldconfig/elfhints.c
---- sbin.orig/ldconfig/elfhints.c	2001-05-03 00:56:18 +0100
-+++ sbin/ldconfig/elfhints.c	2007-08-06 10:16:24 +0100
-@@ -245,6 +245,9 @@
- 		else
- 			add_dir(hintsfile, argv[i], 0);
- 	}
-+	/* Always add our system dirs */
-+	add_dir (hintsfile, "/lib", 1);
-+	add_dir (hintsfile, "/usr/lib", 1);
- 	write_elf_hints(hintsfile);
- }
- 

diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-setXid.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-setXid.patch
deleted file mode 100644
index c8cbebc68c2..00000000000
--- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-setXid.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur sbin.orig/ping/Makefile sbin.setXid/ping/Makefile
---- sbin.orig/ping/Makefile	Thu Apr  7 20:27:57 2005
-+++ sbin.setXid/ping/Makefile	Thu Apr  7 20:42:02 2005
-@@ -18,4 +18,6 @@
- LDADD+=	-lipsec
- .endif
- 
-+LDFLAGS+= -Wl,-z,now
-+
- .include <bsd.prog.mk>
-diff -ur sbin.orig/shutdown/Makefile sbin.setXid/shutdown/Makefile
---- sbin.orig/shutdown/Makefile	Thu Apr  7 20:27:57 2005
-+++ sbin.setXid/shutdown/Makefile	Thu Apr  7 20:42:17 2005
-@@ -7,4 +7,6 @@
- BINGRP=	operator
- BINMODE=4550
- 
-+LDFLAGS+= -Wl,-z,now
-+
- .include <bsd.prog.mk>

diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-11.1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-11.1.ebuild
deleted file mode 100644
index 50a513208cb..00000000000
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-11.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd multilib
-
-DESCRIPTION="FreeBSD sbin utils"
-SLOT="0"
-LICENSE="BSD zfs? ( CDDL )"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	sbin/
-	contrib/
-	lib/
-	libexec/
-	usr.sbin/
-	etc/
-"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?]
-	zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
-	>=dev-libs/expat-2.0.1
-	ssl? ( dev-libs/openssl:0= )
-	>=dev-libs/libedit-20120311.3.0-r1
-	sys-libs/readline:0=
-	|| (
-		sys-process/cronie
-		sys-process/vixie-cron
-	)
-	atm? ( net-analyzer/bsnmp )"
-DEPEND="${RDEPEND}
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/sbin"
-
-IUSE="atm ipfilter +pf ipv6 build ssl +cxx netware zfs"
-
-pkg_setup() {
-	# Add the required source files.
-	use build && EXTRACTONLY+="sys/ "
-	use zfs && EXTRACTONLY+="cddl/ "
-
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use cxx || mymakeopts="${mymakeopts} WITHOUT_CXX="
-	use ipfilter || mymakeopts="${mymakeopts} WITHOUT_IPFILTER= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT="
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use pf || mymakeopts="${mymakeopts} WITHOUT_PF= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-}
-
-REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder resolvconf"
-
-PATCHES=( "${FILESDIR}/${PN}-setXid.patch"
-	"${FILESDIR}/${PN}-10.0-zlib.patch"
-	"${FILESDIR}/${PN}-6.2-ldconfig.patch"
-	"${FILESDIR}/${PN}-6.1-pr102701.patch" )
-
-src_prepare() {
-	if [[ ! -e "${WORKDIR}/sys" ]]; then
-		use build || ln -s "/usr/src/sys" "${WORKDIR}/sys"
-	fi
-}
-
-src_install() {
-	mymakeopts="${mymakeopts} GEOM_CLASS_DIR=/$(get_libdir)/geom "
-	freebsd_src_install
-	keepdir /var/log
-	# Needed by ldconfig:
-	keepdir /var/run
-
-	# Maybe ship our own sysctl.conf so things like radvd work out of the box.
-	# New wireless config method requires regdomain.xml in /etc
-	cd "${WORKDIR}/etc/" || die
-	insinto /etc
-	doins minfree sysctl.conf regdomain.xml || die
-
-	# Install a crontab for adjkerntz
-	insinto /etc/cron.d
-	newins "${FILESDIR}/adjkerntz-crontab" adjkerntz
-
-	# Install the periodic stuff (needs probably to be ported in a more
-	# gentooish way)
-	cd "${WORKDIR}/etc/periodic" || die
-
-	doperiodic security \
-		security/*.ipfwlimit \
-		security/*.ipfwdenied || die
-
-	use ipfilter && { doperiodic security \
-		security/*.ipfdenied || die ; }
-
-	use pf && { doperiodic security \
-		security/*.pfdenied || die ; }
-}

diff --git a/sys-freebsd/freebsd-sbin/metadata.xml b/sys-freebsd/freebsd-sbin/metadata.xml
deleted file mode 100644
index d5e74326398..00000000000
--- a/sys-freebsd/freebsd-sbin/metadata.xml
+++ /dev/null
@@ -1,21 +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>
-  <use>
-    <flag name="ipfilter">
-      Build tools to administer the ipfilter firewall.
-    </flag>
-    <flag name="pf">
-      Build tools to administer the PF firewall.
-    </flag>
-    <flag name="netware">
-      Build libraries and tools to work with NetWare protocols (IPX
-      and NCP).
-    </flag>
-    <flag name="zfs">Enable ZFS support.</flag>
-  </use>
-</pkgmetadata>