summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2019-10-11 17:10:39 +0200
committerMichał Górny <mgorny@gentoo.org>2019-10-11 17:16:31 +0200
commit4645440f7e96d484da112a2224556e43430e143c (patch)
tree5d85c6872ec8a2e63d00fa3216062b5f77dde36d /sys-freebsd/freebsd-usbin/files
parentsys-freebsd/ubin-wrappers: Remove last-rited pkg (diff)
downloadgentoo-4645440f7e96d484da112a2224556e43430e143c.tar.gz
gentoo-4645440f7e96d484da112a2224556e43430e143c.tar.bz2
gentoo-4645440f7e96d484da112a2224556e43430e143c.zip
sys-freebsd/freebsd-usbin: Remove last-rited pkg
Closes: https://bugs.gentoo.org/683284 Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'sys-freebsd/freebsd-usbin/files')
-rw-r--r--sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch13
-rw-r--r--sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.0-workaround.patch13
-rw-r--r--sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.1-bsdxml2expat.patch26
-rw-r--r--sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch12
-rw-r--r--sys-freebsd/freebsd-usbin/files/freebsd-usbin-SA-1803-speculative_execution-amd64-11.patch189
-rw-r--r--sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch20
-rw-r--r--sys-freebsd/freebsd-usbin/files/iscsid.initd20
-rw-r--r--sys-freebsd/freebsd-usbin/files/nfs.confd10
-rw-r--r--sys-freebsd/freebsd-usbin/files/nfs.initd54
-rw-r--r--sys-freebsd/freebsd-usbin/files/nfsuserd.confd5
-rw-r--r--sys-freebsd/freebsd-usbin/files/nfsuserd.initd20
-rw-r--r--sys-freebsd/freebsd-usbin/files/pw.conf5
-rw-r--r--sys-freebsd/freebsd-usbin/files/rpc.lockd.initd20
-rw-r--r--sys-freebsd/freebsd-usbin/files/rpc.statd.initd20
14 files changed, 0 insertions, 427 deletions
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch
deleted file mode 100644
index 207b6ab6a50d..000000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/usr.sbin/camdd/camdd.c b/usr.sbin/camdd/camdd.c
-index 88c648e..edf9c8b 100644
---- a/usr.sbin/camdd/camdd.c
-+++ b/usr.sbin/camdd/camdd.c
-@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD: stable/10/usr.sbin/camdd/camdd.c 293409 2016-01-08 02:56:21Z
- #include <libutil.h>
- #include <pthread.h>
- #include <assert.h>
--#include <bsdxml.h>
-+#include <expat.h>
-
- #include <cam/cam.h>
- #include <cam/cam_debug.h>
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.0-workaround.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.0-workaround.patch
deleted file mode 100644
index 04ba75a17ec5..000000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.0-workaround.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/usr.sbin/nmtree/Makefile b/usr.sbin/nmtree/Makefile
-index 033002c..d198f10 100644
---- a/usr.sbin/nmtree/Makefile
-+++ b/usr.sbin/nmtree/Makefile
-@@ -5,7 +5,7 @@
- .PATH: ${.CURDIR}/../../contrib/mtree
-
- PROG= mtree
--MAN= mtree.5 mtree.8
-+MAN= mtree.8
- SRCS= compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \
- only.c spec.c specspec.c verify.c
-
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.1-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.1-bsdxml2expat.patch
deleted file mode 100644
index 5317b256cb4c..000000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.1-bsdxml2expat.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c
-index 9a9d3ff..bf6b1b2 100644
---- a/usr.sbin/ctladm/ctladm.c
-+++ b/usr.sbin/ctladm/ctladm.c
-@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD: stable/11/usr.sbin/ctladm/ctladm.c 319152 2017-05-29 18:17:3
- #include <sys/queue.h>
- #include <sys/sbuf.h>
- #include <sys/stat.h>
--#include <bsdxml.h>
-+#include <expat.h>
- #include <ctype.h>
- #include <err.h>
- #include <errno.h>
-diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c
-index 7054a04..ee05214 100644
---- a/usr.sbin/ctld/kernel.c
-+++ b/usr.sbin/ctld/kernel.c
-@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD: stable/11/usr.sbin/ctld/kernel.c 319152 2017-05-29 18:17:34Z
- #include <sys/sbuf.h>
- #include <sys/stat.h>
- #include <assert.h>
--#include <bsdxml.h>
-+#include <expat.h>
- #include <ctype.h>
- #include <errno.h>
- #include <fcntl.h>
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch
deleted file mode 100644
index 1d838655c88e..000000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr usr.sbin/newsyslog.old/pathnames.h usr.sbin/newsyslog/pathnames.h
---- usr.sbin/newsyslog.old/pathnames.h 2011-11-02 20:12:37.000000000 +0000
-+++ usr.sbin/newsyslog/pathnames.h 2011-11-02 20:12:50.000000000 +0000
-@@ -24,6 +24,6 @@
-
- #define _PATH_CONF "/etc/newsyslog.conf"
- #define _PATH_SYSLOGPID _PATH_VARRUN "syslog.pid"
--#define _PATH_BZIP2 "/usr/bin/bzip2"
--#define _PATH_GZIP "/usr/bin/gzip"
-+#define _PATH_BZIP2 "/bin/bzip2"
-+#define _PATH_GZIP "/bin/gzip"
- #define _PATH_XZ "/usr/bin/xz"
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-SA-1803-speculative_execution-amd64-11.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-SA-1803-speculative_execution-amd64-11.patch
deleted file mode 100644
index 0cc67ad8f342..000000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-SA-1803-speculative_execution-amd64-11.patch
+++ /dev/null
@@ -1,189 +0,0 @@
---- usr.sbin/cpucontrol/cpucontrol.8.orig
-+++ usr.sbin/cpucontrol/cpucontrol.8
-@@ -24,7 +24,7 @@
- .\"
- .\" $FreeBSD$
- .\"
--.Dd June 30, 2009
-+.Dd January 5, 2018
- .Dt CPUCONTROL 8
- .Os
- .Sh NAME
-@@ -36,44 +36,48 @@
- .Nm
- .Op Fl vh
- .Fl m Ar msr
--.Bk
- .Ar device
- .Ek
-+.Bk
- .Nm
- .Op Fl vh
- .Fl m Ar msr Ns = Ns Ar value
--.Bk
- .Ar device
- .Ek
-+.Bk
- .Nm
- .Op Fl vh
- .Fl m Ar msr Ns &= Ns Ar mask
--.Bk
- .Ar device
- .Ek
-+.Bk
- .Nm
- .Op Fl vh
- .Fl m Ar msr Ns |= Ns Ar mask
--.Bk
- .Ar device
- .Ek
-+.Bk
- .Nm
- .Op Fl vh
- .Fl i Ar level
--.Bk
- .Ar device
- .Ek
-+.Bk
- .Nm
- .Op Fl vh
- .Fl i Ar level,level_type
--.Bk
- .Ar device
- .Ek
-+.Bk
- .Nm
- .Op Fl vh
- .Op Fl d Ar datadir
- .Fl u
-+.Ar device
-+.Ek
- .Bk
-+.Nm
-+.Fl e
- .Ar device
- .Ek
- .Sh DESCRIPTION
-@@ -129,6 +133,20 @@
- .Nm
- utility will walk through the configured data directories
- and apply all firmware updates available for this CPU.
-+.It Fl e
-+Re-evaluate the kernel flags indicating the present CPU features.
-+This command is typically executed after a firmware update was applied
-+which changes information reported by the
-+.Dv CPUID
-+instruction.
-+.Pp
-+.Bf -symbolic
-+Only execute the
-+.Fl e
-+command after the microcode update was applied to all CPUs in the system.
-+The kernel does not operate correctly if the features of processors are
-+not identical.
-+.Ef
- .It Fl v
- Increase the verbosity level.
- .It Fl h
---- usr.sbin/cpucontrol/cpucontrol.c.orig
-+++ usr.sbin/cpucontrol/cpucontrol.c
-@@ -60,6 +60,7 @@
- #define FLAG_I 0x01
- #define FLAG_M 0x02
- #define FLAG_U 0x04
-+#define FLAG_E 0x10
-
- #define OP_INVAL 0x00
- #define OP_READ 0x01
-@@ -114,7 +115,7 @@
- if (name == NULL)
- name = "cpuctl";
- fprintf(stderr, "Usage: %s [-vh] [-d datadir] [-m msr[=value] | "
-- "-i level | -i level,level_type | -u] device\n", name);
-+ "-i level | -i level,level_type | -e | -u] device\n", name);
- exit(EX_USAGE);
- }
-
-@@ -338,6 +339,25 @@
- }
-
- static int
-+do_eval_cpu_features(const char *dev)
-+{
-+ int fd, error;
-+
-+ assert(dev != NULL);
-+
-+ fd = open(dev, O_RDWR);
-+ if (fd < 0) {
-+ WARN(0, "error opening %s for writing", dev);
-+ return (1);
-+ }
-+ error = ioctl(fd, CPUCTL_EVAL_CPU_FEATURES, NULL);
-+ if (error < 0)
-+ WARN(0, "ioctl(%s, CPUCTL_EVAL_CPU_FEATURES)", dev);
-+ close(fd);
-+ return (error);
-+}
-+
-+static int
- do_update(const char *dev)
- {
- int fd;
-@@ -431,11 +451,14 @@
- * Add all default data dirs to the list first.
- */
- datadir_add(DEFAULT_DATADIR);
-- while ((c = getopt(argc, argv, "d:hi:m:uv")) != -1) {
-+ while ((c = getopt(argc, argv, "d:ehi:m:uv")) != -1) {
- switch (c) {
- case 'd':
- datadir_add(optarg);
- break;
-+ case 'e':
-+ flags |= FLAG_E;
-+ break;
- case 'i':
- flags |= FLAG_I;
- cmdarg = optarg;
-@@ -464,22 +487,25 @@
- /* NOTREACHED */
- }
- dev = argv[0];
-- c = flags & (FLAG_I | FLAG_M | FLAG_U);
-+ c = flags & (FLAG_E | FLAG_I | FLAG_M | FLAG_U);
- switch (c) {
-- case FLAG_I:
-- if (strstr(cmdarg, ",") != NULL)
-- error = do_cpuid_count(cmdarg, dev);
-- else
-- error = do_cpuid(cmdarg, dev);
-- break;
-- case FLAG_M:
-- error = do_msr(cmdarg, dev);
-- break;
-- case FLAG_U:
-- error = do_update(dev);
-- break;
-- default:
-- usage(); /* Only one command can be selected. */
-+ case FLAG_I:
-+ if (strstr(cmdarg, ",") != NULL)
-+ error = do_cpuid_count(cmdarg, dev);
-+ else
-+ error = do_cpuid(cmdarg, dev);
-+ break;
-+ case FLAG_M:
-+ error = do_msr(cmdarg, dev);
-+ break;
-+ case FLAG_U:
-+ error = do_update(dev);
-+ break;
-+ case FLAG_E:
-+ error = do_eval_cpu_features(dev);
-+ break;
-+ default:
-+ usage(); /* Only one command can be selected. */
- }
- SLIST_FREE(&datadirs, next, free);
- return (error == 0 ? 0 : 1);
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch
deleted file mode 100644
index 39177b4a987d..000000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- usr.sbin/adduser/adduser.sh.old 2006-10-01 13:41:16 +0000
-+++ usr.sbin/adduser/adduser.sh 2006-10-01 13:41:38 +0000
-@@ -809,7 +809,7 @@
- NOHOME="/nonexistent"
- NOLOGIN="nologin"
- NOLOGIN_PATH="/usr/sbin/nologin"
--GREPCMD="/usr/bin/grep"
-+GREPCMD="/bin/grep"
- DATECMD="/bin/date"
-
- # Set default values
-@@ -823,7 +823,7 @@
- uhome=
- upass=
- ushell=
--udotdir=/usr/share/skel
-+udotdir=/etc/skel
- ugroups=
- uexpire=
- upwexpire=
diff --git a/sys-freebsd/freebsd-usbin/files/iscsid.initd b/sys-freebsd/freebsd-usbin/files/iscsid.initd
deleted file mode 100644
index f16d00e876ab..000000000000
--- a/sys-freebsd/freebsd-usbin/files/iscsid.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need net
-}
-
-start() {
- ebegin "Starting iscsid"
- start-stop-daemon --start --quiet --exec \
- /usr/sbin/iscsid -- $iscsidopts
- eend $? "Error starting iscsid"
-}
-
-stop() {
- ebegin "Stopping iscsid"
- start-stop-daemon --stop --quiet --exec /usr/sbin/iscsid
- eend $? "Error stopping iscsid"
-}
diff --git a/sys-freebsd/freebsd-usbin/files/nfs.confd b/sys-freebsd/freebsd-usbin/files/nfs.confd
deleted file mode 100644
index 844252fdc54d..000000000000
--- a/sys-freebsd/freebsd-usbin/files/nfs.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# Config file for /etc/init.d/nfs
-# Options for nfsd (see man nfsd)
-# Example: 8 nfsd servers started:
-#nfsdopts="-n 8"
-
-# Options for mountd (see man mountd)
-# Example: allow non-root users to mount shares:
-#mountdopts="-n"
-# Specify t he exports file, this is the default:
-#exportsfile="/etc/exports"
diff --git a/sys-freebsd/freebsd-usbin/files/nfs.initd b/sys-freebsd/freebsd-usbin/files/nfs.initd
deleted file mode 100644
index 17974ca0998a..000000000000
--- a/sys-freebsd/freebsd-usbin/files/nfs.initd
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-#---------------------------------------------------------------------------
-# This script starts/stops nfsd and mountd
-# Daemons rpc.rquotad, rpc.rstatd, rpc.rusersd, rpc.rwalld and rpc.sprayd
-# should be started from inetd on FreeBSD.
-#---------------------------------------------------------------------------
-
-extra_started_commands="reload"
-
-# The binary locations
-nfsd=/usr/sbin/nfsd
-mountd=/usr/sbin/mountd
-
-depend() {
- use ypbind net rpc.lockd
- need rpcbind
- after quota
-}
-
-start() {
- ebegin "Starting NFS daemon"
- start-stop-daemon --start --quiet --exec \
- $nfsd -- ${nfsdopts}
- eend $? "Error starting NFS daemon"
-
- # Start mountd
- ebegin "Starting NFS mountd"
- start-stop-daemon --start --quiet --exec \
- $mountd -- ${mountdopts} ${exportsfile}
- eend $? "Error starting NFS mountd"
-}
-
-stop() {
- ebegin "Stopping NFS mountd"
- start-stop-daemon --stop --quiet --exec $mountd \
- --pidfile /var/run/mountd.pid
- eend $? "Error stopping NFS mountd"
-
- ebegin "Stopping NFS daemon"
- start-stop-daemon --stop --signal USR1 --quiet \
- --name nfsd --user root
- eend $? "Error stopping NFS daemon"
-}
-
-reload() {
- # Hangup signal to mountd reloads /etc/exports.
- ebegin "Reloading /etc/exports"
- start-stop-daemon --signal 1 --quiet --exec $mountd \
- --pidfile /var/run/mountd.pid
- eend $?
-}
diff --git a/sys-freebsd/freebsd-usbin/files/nfsuserd.confd b/sys-freebsd/freebsd-usbin/files/nfsuserd.confd
deleted file mode 100644
index f8f3ea1e31de..000000000000
--- a/sys-freebsd/freebsd-usbin/files/nfsuserd.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for /etc/init.d/nfsuserd
-# Options for nfsuserd (see man nfsuserd)
-# Example: set domain example.com:
-#nfsuserdopts="-domain example.com"
-
diff --git a/sys-freebsd/freebsd-usbin/files/nfsuserd.initd b/sys-freebsd/freebsd-usbin/files/nfsuserd.initd
deleted file mode 100644
index d69007412fc6..000000000000
--- a/sys-freebsd/freebsd-usbin/files/nfsuserd.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need net nfs
-}
-
-start() {
- ebegin "Starting nfsuserd"
- start-stop-daemon --start --quiet --exec \
- /usr/sbin/nfsuserd -- $nfsuserdopts
- eend $? "Error starting nfsuserd"
-}
-
-stop() {
- ebegin "Stopping nfsuserd"
- start-stop-daemon --stop --quiet --exec /usr/sbin/nfsuserd
- eend $? "Error stopping nfsuserd"
-}
diff --git a/sys-freebsd/freebsd-usbin/files/pw.conf b/sys-freebsd/freebsd-usbin/files/pw.conf
deleted file mode 100644
index 29a246f72b8f..000000000000
--- a/sys-freebsd/freebsd-usbin/files/pw.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Change this to Gentoo's Default, instead of FreeBSD's default of
-# /usr/share/skel, so that bash and other packages installs the files on the
-# right place.
-skeleton /etc/skel
-
diff --git a/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd b/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd
deleted file mode 100644
index dd2fdbe8a756..000000000000
--- a/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need net rpcbind rpc.statd
-}
-
-start() {
- ebegin "Starting NFS lockd"
- start-stop-daemon --start --quiet --exec \
- /usr/sbin/rpc.lockd -- $rpclockdopts
- eend $? "Error starting NFS lockd"
-}
-
-stop() {
- ebegin "Stopping NFS lockd"
- start-stop-daemon --stop --quiet --exec /usr/sbin/rpc.lockd
- eend $? "Error stopping NFS lockd"
-}
diff --git a/sys-freebsd/freebsd-usbin/files/rpc.statd.initd b/sys-freebsd/freebsd-usbin/files/rpc.statd.initd
deleted file mode 100644
index 163af5a4b4a1..000000000000
--- a/sys-freebsd/freebsd-usbin/files/rpc.statd.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need net rpcbind
-}
-
-start() {
- ebegin "Starting NFS statd"
- start-stop-daemon --start --quiet --exec \
- /usr/sbin/rpc.statd -- $rpcstatdopts
- eend $? "Error starting NFS statd"
-}
-
-stop() {
- ebegin "Stopping NFS statd"
- start-stop-daemon --stop --quiet --exec /usr/sbin/rpc.statd
- eend $? "Error stopping NFS statd"
-}