diff options
author | Rene Ladan <rene@FreeBSD.org> | 2021-09-11 14:57:58 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2021-09-30 21:23:30 +0000 |
commit | 620968a43a5f9bb3fa98ab20f257a4c0d864caa7 (patch) | |
tree | 09bef799707f4b6e715b912429bd3b73c1addf4c /sysutils | |
parent | b9a93c0bf4778b9ec327c1be6f819eb1ff90ec19 (diff) | |
download | ports-620968a43a5f9bb3fa98ab20f257a4c0d864caa7.tar.gz ports-620968a43a5f9bb3fa98ab20f257a4c0d864caa7.zip |
cleanup: drop support for EOL FreeBSD 11.X
Search criteria used:
- 11.4
- OSREL*
- OSVER*
- *_FreeBSD_11
Input from:
- adridg: devel/qca-legacy
- jbeich: _WITH_DPRINTF, _WITH_GETLINE, GNU bfd workarounds
- sunpoet: security/p5-*OpenSSL*
Reviewed by: doceng, kde, multimedia, perl, python, ruby, rust
Differential Revision: https://reviews.freebsd.org/D32008
Test Plan: make index
Diffstat (limited to 'sysutils')
42 files changed, 13 insertions, 1119 deletions
diff --git a/sysutils/acpica-tools/Makefile b/sysutils/acpica-tools/Makefile index 005a6e36aeed..76c38c138274 100644 --- a/sysutils/acpica-tools/Makefile +++ b/sysutils/acpica-tools/Makefile @@ -12,7 +12,6 @@ COMMENT= Tools from the ACPI Component Architecture (ACPICA) project LICENSE= BSD3CLAUSE GPLv2 LICENSE_COMB= dual -BROKEN_FreeBSD_11_powerpc64= fails to compile on powerpc64 elfv1: comparison is always true due to limited range of data type BROKEN_FreeBSD_12_powerpc64= fails to compile on powerpc64 elfv1: comparison is always true due to limited range of data type USES= gmake diff --git a/sysutils/apache-mesos/Makefile b/sysutils/apache-mesos/Makefile index cba0d28870a1..51b89f27cf3a 100644 --- a/sysutils/apache-mesos/Makefile +++ b/sysutils/apache-mesos/Makefile @@ -13,8 +13,6 @@ COMMENT= Cluster manager providing resource isolation and sharing LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -IGNORE_FreeBSD_11= does not build - BUILD_DEPENDS= boost-libs>0:devel/boost-libs \ elfio>0:devel/elfio \ http-parser>0:www/http-parser \ diff --git a/sysutils/arcconf/Makefile b/sysutils/arcconf/Makefile index 5077bf5af7b2..cbb26407408b 100644 --- a/sysutils/arcconf/Makefile +++ b/sysutils/arcconf/Makefile @@ -25,13 +25,8 @@ SUB_FILES+= ${PERIODICSCRIPT} PERIODICSCRIPT= 410.status-aac-raid -.include <bsd.port.pre.mk> -.if ${OSREL:R} >= 12 DIST_TYPE= 12_x64 RUN_DEPENDS+= ${LOCALBASE}/lib/compat/libncurses.so.8:misc/compat12x -.else -DIST_TYPE= 11_x64 -.endif NO_BUILD= yes NO_WRKSUBDIR= yes @@ -44,4 +39,4 @@ do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ${INSTALL_SCRIPT} ${WRKDIR}/${PERIODICSCRIPT} ${STAGEDIR}${PREFIX}/etc/periodic/daily -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/barrier/Makefile b/sysutils/barrier/Makefile index f9a1042e0454..f8fdafdd26ea 100644 --- a/sysutils/barrier/Makefile +++ b/sysutils/barrier/Makefile @@ -20,8 +20,6 @@ MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= EXAMPLES GUI OPTIONS_DEFAULT= GUI -# no GUI option on 11.x with base SSL since qt5-network is not available -OPTIONS_EXCLUDE= ${${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} == base:?GUI:} OPTIONS_SUB= yes GUI_DESC= Build configuration utility (requires Qt 5) diff --git a/sysutils/bhyve+/Makefile b/sysutils/bhyve+/Makefile index 04f6642286a8..9945c581697f 100644 --- a/sysutils/bhyve+/Makefile +++ b/sysutils/bhyve+/Makefile @@ -33,9 +33,7 @@ GH_TAGNAME= 7ef466772108856ee3e093735033232a6f1a3f04 USE_LDCONFIG= yes -.if 1100000 <= ${OSVERSION} && ${OSVERSION} < 1200000 -EXTRA_PATCHES= ${PATCHDIR}/freebsd-11 -.elif 1200000 <= ${OSVERSION} && ${OSVERSION} < 1300000 +.if 1200000 <= ${OSVERSION} && ${OSVERSION} < 1300000 EXTRA_PATCHES= ${PATCHDIR}/freebsd-12 .elif 1300000 <= ${OSVERSION} && ${OSVERSION} < 1400000 EXTRA_PATCHES= ${PATCHDIR}/freebsd-13 diff --git a/sysutils/bhyve+/files/freebsd-11/patch-bhyve-shelp b/sysutils/bhyve+/files/freebsd-11/patch-bhyve-shelp deleted file mode 100644 index 8f2bc12fa573..000000000000 --- a/sysutils/bhyve+/files/freebsd-11/patch-bhyve-shelp +++ /dev/null @@ -1,79 +0,0 @@ ---- usr.sbin/bhyve/pci_emul.c.orig 2021-08-21 23:52:31 UTC -+++ usr.sbin/bhyve/pci_emul.c -@@ -237,6 +237,17 @@ done: - return (error); - } - -+void -+pci_print_supported_devices() -+{ -+ struct pci_devemu **pdpp, *pdp; -+ -+ SET_FOREACH(pdpp, pci_devemu_set) { -+ pdp = *pdpp; -+ printf("%s\n", pdp->pe_emu); -+ } -+} -+ - static int - pci_valid_pba_offset(struct pci_devinst *pi, uint64_t offset) - { ---- usr.sbin/bhyve/pci_emul.h.orig 2021-08-21 23:54:47 UTC -+++ usr.sbin/bhyve/pci_emul.h -@@ -235,6 +235,7 @@ int pci_msix_table_bar(struct pci_devins - int pci_msix_pba_bar(struct pci_devinst *pi); - int pci_msi_maxmsgnum(struct pci_devinst *pi); - int pci_parse_slot(char *opt); -+void pci_print_supported_devices(); - void pci_populate_msicap(struct msicap *cap, int msgs, int nextptr); - int pci_emul_add_msixcap(struct pci_devinst *pi, int msgnum, int barnum); - int pci_emul_msix_twrite(struct pci_devinst *pi, uint64_t offset, int size, -diff --git a/bhyve.8.orig b/bhyve.8 -index 32392c9..0d4b16f 100644 ---- usr.sbin/bhyve/bhyve.8.orig -+++ usr.sbin/bhyve/bhyve.8 -@@ -47,7 +47,11 @@ - .Op Fl l Ar lpcdev Ns Op , Ns Ar conf - .Op Fl m Ar memsize Ns Op Ar K|k|M|m|G|g|T|t - .Op Fl p Ar vcpu:hostcpu --.Op Fl s Ar slot,emulation Ns Op , Ns Ar conf -+.Oo Fl s -+.Sm off -+.Cm help | Ar slot,emulation Ns Op , Ns Ar conf -+.Sm on -+.Oc - .Op Fl U Ar uuid - .Ar vmname - .Sh DESCRIPTION -@@ -157,7 +161,7 @@ to - .Em hostcpu . - .It Fl P - Force the guest virtual CPU to exit when a PAUSE instruction is detected. --.It Fl s Ar slot,emulation Ns Op , Ns Ar conf -+.It Fl s Op Ar help|slot,emulation Ns Op , Ns Ar conf - Configure a virtual PCI slot and function. - .Pp - .Nm -@@ -166,6 +170,8 @@ slots on the bus. - There are 32 available slots, with the option of providing up to 8 functions - per slot. - .Bl -tag -width 10n -+.It Ar help -+print a list of supported PCI devices. - .It Ar slot - .Ar pcislot[:function] - .Ar bus:pcislot:function ---- usr.sbin/bhyve/bhyverun.c.orig 2021-08-21 23:52:19 UTC -+++ usr.sbin/bhyve/bhyverun.c -@@ -1058,7 +1058,10 @@ main(int argc, char *argv[]) - } - break; - case 's': -- if (pci_parse_slot(optarg) != 0) -+ if (strncmp(optarg, "help", strlen(optarg)) == 0) { -+ pci_print_supported_devices(); -+ exit(0); -+ } else if (pci_parse_slot(optarg) != 0) - exit(4); - else - break; diff --git a/sysutils/bhyve+/files/freebsd-11/patch-libvmmapi b/sysutils/bhyve+/files/freebsd-11/patch-libvmmapi deleted file mode 100644 index 16f14a57bf9a..000000000000 --- a/sysutils/bhyve+/files/freebsd-11/patch-libvmmapi +++ /dev/null @@ -1,33 +0,0 @@ ---- lib/libvmmapi/Makefile.orig 2021-09-04 01:05:23.110816000 UTC -+++ lib/libvmmapi/Makefile -@@ -6,6 +6,7 @@ - INCS= vmmapi.h - - WARNS?= 2 -+SHLIB_MAJOR?= 5.1 - - LIBADD= util - ---- usr.sbin/bhyvectl/Makefile.orig 2021-09-04 02:33:12.704720000 +0200 -+++ usr.sbin/bhyvectl/Makefile 2021-09-04 02:34:28.740202000 +0200 -@@ -8,7 +8,8 @@ - - MAN= bhyvectl.8 - --LIBADD= vmmapi util -+LIBADD= util -+LDADD= ../../lib/libvmmapi/libvmmapi.so.5.1 - - WARNS?= 3 - ---- usr.sbin/bhyveload/Makefile.orig 2021-09-04 02:33:20.942548000 +0200 -+++ usr.sbin/bhyveload/Makefile 2021-09-04 02:35:58.712996000 +0200 -@@ -5,7 +5,7 @@ - MAN= bhyveload.8 - PACKAGE= bhyve - --LIBADD= vmmapi -+LDADD= ../../lib/libvmmapi/libvmmapi.so.5.1 - - WARNS?= 3 - diff --git a/sysutils/bhyve+/files/freebsd-11/patch-virtio-9p b/sysutils/bhyve+/files/freebsd-11/patch-virtio-9p deleted file mode 100644 index 1f98ebb69ddf..000000000000 --- a/sysutils/bhyve+/files/freebsd-11/patch-virtio-9p +++ /dev/null @@ -1,385 +0,0 @@ ---- usr.sbin/bhyve/Makefile.orig 2021-08-20 16:08:36 UTC -+++ usr.sbin/bhyve/Makefile -@@ -3,6 +3,7 @@ - # - - .include <src.opts.mk> -+CFLAGS+=-I${SRCTOP}/contrib/lib9p - CFLAGS+=-I${SRCTOP}/sys - - PROG= bhyve -@@ -37,6 +38,7 @@ SRCS= \ - pci_irq.c \ - pci_lpc.c \ - pci_passthru.c \ -+ pci_virtio_9p.c \ - pci_virtio_block.c \ - pci_virtio_console.c \ - pci_virtio_net.c \ -@@ -63,7 +65,8 @@ SRCS= \ - .PATH: ${BHYVE_SYSDIR}/sys/amd64/vmm - SRCS+= vmm_instruction_emul.c - --LIBADD= vmmapi md pthread z -+LIBADD= md pthread z sbuf casper cap_pwd cap_grp -+LDADD+= ../../contrib/lib9p/lib9p.so.1.1 ../../lib/libvmmapi/libvmmapi.so.5.1 - - .if ${MK_INET_SUPPORT} != "no" - CFLAGS+=-DINET ---- usr.sbin/bhyve/pci_virtio_9p.c.orig 2021-08-20 16:11:13 UTC -+++ usr.sbin/bhyve/pci_virtio_9p.c -@@ -0,0 +1,344 @@ -+/*- -+ * Copyright (c) 2015 iXsystems Inc. -+ * Copyright (c) 2017-2018 Jakub Klama <jceel@FreeBSD.org> -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer -+ * in this position and unchanged. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ */ -+ -+/* -+ * VirtIO filesystem passthrough using 9p protocol. -+ */ -+ -+#include <sys/cdefs.h> -+__FBSDID("$FreeBSD$"); -+ -+#include <sys/param.h> -+#include <sys/linker_set.h> -+#include <sys/uio.h> -+#include <sys/capsicum.h> -+ -+#include <errno.h> -+#include <fcntl.h> -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <unistd.h> -+#include <assert.h> -+#include <pthread.h> -+ -+#include <lib9p.h> -+#include <backend/fs.h> -+ -+#include "bhyverun.h" -+#include "pci_emul.h" -+#include "virtio.h" -+ -+#define VT9P_MAX_IOV 128 -+#define VT9P_RINGSZ 256 -+#define VT9P_MAXTAGSZ 256 -+#define VT9P_CONFIGSPACESZ (VT9P_MAXTAGSZ + sizeof(uint16_t)) -+ -+static int pci_vt9p_debug; -+#define DPRINTF(params) if (pci_vt9p_debug) printf params -+#define WPRINTF(params) printf params -+ -+/* -+ * Per-device softc -+ */ -+struct pci_vt9p_softc { -+ struct virtio_softc vsc_vs; -+ struct vqueue_info vsc_vq; -+ pthread_mutex_t vsc_mtx; -+ uint64_t vsc_cfg; -+ uint64_t vsc_features; -+ char * vsc_rootpath; -+ struct pci_vt9p_config * vsc_config; -+ struct l9p_backend * vsc_fs_backend; -+ struct l9p_server * vsc_server; -+ struct l9p_connection * vsc_conn; -+}; -+ -+struct pci_vt9p_request { -+ struct pci_vt9p_softc * vsr_sc; -+ struct iovec * vsr_iov; -+ size_t vsr_niov; -+ size_t vsr_respidx; -+ size_t vsr_iolen; -+ uint16_t vsr_idx; -+}; -+ -+struct pci_vt9p_config { -+ uint16_t tag_len; -+ char tag[0]; -+} __attribute__((packed)); -+ -+static int pci_vt9p_send(struct l9p_request *, const struct iovec *, -+ const size_t, const size_t, void *); -+static void pci_vt9p_drop(struct l9p_request *, const struct iovec *, size_t, -+ void *); -+static void pci_vt9p_reset(void *); -+static void pci_vt9p_notify(void *, struct vqueue_info *); -+static int pci_vt9p_cfgread(void *, int, int, uint32_t *); -+static void pci_vt9p_neg_features(void *, uint64_t); -+ -+static struct virtio_consts vt9p_vi_consts = { -+ "vt9p", /* our name */ -+ 1, /* we support 1 virtqueue */ -+ VT9P_CONFIGSPACESZ, /* config reg size */ -+ pci_vt9p_reset, /* reset */ -+ pci_vt9p_notify, /* device-wide qnotify */ -+ pci_vt9p_cfgread, /* read virtio config */ -+ NULL, /* write virtio config */ -+ pci_vt9p_neg_features, /* apply negotiated features */ -+ (1 << 0), /* our capabilities */ -+}; -+ -+ -+static void -+pci_vt9p_reset(void *vsc) -+{ -+ struct pci_vt9p_softc *sc; -+ -+ sc = vsc; -+ -+ DPRINTF(("vt9p: device reset requested !\n")); -+ vi_reset_dev(&sc->vsc_vs); -+} -+ -+static void -+pci_vt9p_neg_features(void *vsc, uint64_t negotiated_features) -+{ -+ struct pci_vt9p_softc *sc = vsc; -+ -+ sc->vsc_features = negotiated_features; -+} -+ -+static int -+pci_vt9p_cfgread(void *vsc, int offset, int size, uint32_t *retval) -+{ -+ struct pci_vt9p_softc *sc = vsc; -+ void *ptr; -+ -+ ptr = (uint8_t *)sc->vsc_config + offset; -+ memcpy(retval, ptr, size); -+ return (0); -+} -+ -+static int -+pci_vt9p_get_buffer(struct l9p_request *req, struct iovec *iov, size_t *niov, -+ void *arg) -+{ -+ struct pci_vt9p_request *preq = req->lr_aux; -+ size_t n = preq->vsr_niov - preq->vsr_respidx; -+ -+ memcpy(iov, preq->vsr_iov + preq->vsr_respidx, -+ n * sizeof(struct iovec)); -+ *niov = n; -+ return (0); -+} -+ -+static int -+pci_vt9p_send(struct l9p_request *req, const struct iovec *iov, -+ const size_t niov, const size_t iolen, void *arg) -+{ -+ struct pci_vt9p_request *preq = req->lr_aux; -+ struct pci_vt9p_softc *sc = preq->vsr_sc; -+ -+ preq->vsr_iolen = iolen; -+ -+ pthread_mutex_lock(&sc->vsc_mtx); -+ vq_relchain(&sc->vsc_vq, preq->vsr_idx, preq->vsr_iolen); -+ vq_endchains(&sc->vsc_vq, 1); -+ pthread_mutex_unlock(&sc->vsc_mtx); -+ free(preq); -+ return (0); -+} -+ -+static void -+pci_vt9p_drop(struct l9p_request *req, const struct iovec *iov, size_t niov, -+ void *arg) -+{ -+ struct pci_vt9p_request *preq = req->lr_aux; -+ struct pci_vt9p_softc *sc = preq->vsr_sc; -+ -+ pthread_mutex_lock(&sc->vsc_mtx); -+ vq_relchain(&sc->vsc_vq, preq->vsr_idx, 0); -+ vq_endchains(&sc->vsc_vq, 1); -+ pthread_mutex_unlock(&sc->vsc_mtx); -+ free(preq); -+} -+ -+static void -+pci_vt9p_notify(void *vsc, struct vqueue_info *vq) -+{ -+ struct iovec iov[VT9P_MAX_IOV]; -+ struct pci_vt9p_softc *sc; -+ struct pci_vt9p_request *preq; -+ uint16_t idx, n, i; -+ uint16_t flags[VT9P_MAX_IOV]; -+ -+ sc = vsc; -+ -+ while (vq_has_descs(vq)) { -+ n = vq_getchain(vq, &idx, iov, VT9P_MAX_IOV, flags); -+ preq = calloc(1, sizeof(struct pci_vt9p_request)); -+ preq->vsr_sc = sc; -+ preq->vsr_idx = idx; -+ preq->vsr_iov = iov; -+ preq->vsr_niov = n; -+ preq->vsr_respidx = 0; -+ -+ /* Count readable descriptors */ -+ for (i = 0; i < n; i++) { -+ if (flags[i] & VRING_DESC_F_WRITE) -+ break; -+ -+ preq->vsr_respidx++; -+ } -+ -+ for (int i = 0; i < n; i++) { -+ DPRINTF(("vt9p: vt9p_notify(): desc%d base=%p, " -+ "len=%zu, flags=0x%04x\r\n", i, iov[i].iov_base, -+ iov[i].iov_len, flags[i])); -+ } -+ -+ l9p_connection_recv(sc->vsc_conn, iov, preq->vsr_respidx, preq); -+ } -+} -+ -+ -+static int -+pci_vt9p_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts) -+{ -+ struct pci_vt9p_softc *sc; -+ char *opt; -+ char *sharename = NULL; -+ char *rootpath = NULL; -+ int rootfd; -+ bool ro = false; -+ cap_rights_t rootcap; -+ -+ if (opts == NULL) { -+ printf("virtio-9p: share name and path required\n"); -+ return (1); -+ } -+ -+ while ((opt = strsep(&opts, ",")) != NULL) { -+ if (strchr(opt, '=') != NULL) { -+ if (sharename != NULL) { -+ printf("virtio-9p: more than one share name given\n"); -+ return (1); -+ } -+ -+ sharename = strsep(&opt, "="); -+ rootpath = opt; -+ continue; -+ } -+ -+ if (strcmp(opt, "ro") == 0) { -+ DPRINTF(("read-only mount requested\r\n")); -+ ro = true; -+ continue; -+ } -+ -+ printf("virtio-9p: invalid option '%s'\n", opt); -+ return (1); -+ } -+ -+ if (strlen(sharename) > VT9P_MAXTAGSZ) { -+ printf("virtio-9p: share name too long\n"); -+ return (1); -+ } -+ -+ rootfd = open(rootpath, O_DIRECTORY); -+ if (rootfd < 0) -+ return (-1); -+ -+ sc = calloc(1, sizeof(struct pci_vt9p_softc)); -+ sc->vsc_config = calloc(1, sizeof(struct pci_vt9p_config) + -+ VT9P_MAXTAGSZ); -+ -+ pthread_mutex_init(&sc->vsc_mtx, NULL); -+ -+ cap_rights_init(&rootcap, -+ CAP_LOOKUP, CAP_ACL_CHECK, CAP_ACL_DELETE, CAP_ACL_GET, -+ CAP_ACL_SET, CAP_READ, CAP_WRITE, CAP_SEEK, CAP_FSTAT, -+ CAP_CREATE, CAP_FCHMODAT, CAP_FCHOWNAT, CAP_FTRUNCATE, -+ CAP_LINKAT_SOURCE, CAP_LINKAT_TARGET, CAP_MKDIRAT, CAP_MKNODAT, -+ CAP_PREAD, CAP_PWRITE, CAP_RENAMEAT_SOURCE, CAP_RENAMEAT_TARGET, -+ CAP_SEEK, CAP_SYMLINKAT, CAP_UNLINKAT, CAP_EXTATTR_DELETE, -+ CAP_EXTATTR_GET, CAP_EXTATTR_LIST, CAP_EXTATTR_SET, -+ CAP_FUTIMES, CAP_FSTATFS, CAP_FSYNC, CAP_FPATHCONF); -+ -+ if (cap_rights_limit(rootfd, &rootcap) != 0) -+ return (1); -+ -+ sc->vsc_config->tag_len = (uint16_t)strlen(sharename); -+ memcpy(sc->vsc_config->tag, sharename, sc->vsc_config->tag_len); -+ -+ if (l9p_backend_fs_init(&sc->vsc_fs_backend, rootfd, ro) != 0) { -+ errno = ENXIO; -+ return (1); -+ } -+ -+ if (l9p_server_init(&sc->vsc_server, sc->vsc_fs_backend) != 0) { -+ errno = ENXIO; -+ return (1); -+ } -+ -+ if (l9p_connection_init(sc->vsc_server, &sc->vsc_conn) != 0) { -+ errno = EIO; -+ return (1); -+ } -+ -+ sc->vsc_conn->lc_msize = L9P_MAX_IOV * PAGE_SIZE; -+ sc->vsc_conn->lc_lt.lt_get_response_buffer = pci_vt9p_get_buffer; -+ sc->vsc_conn->lc_lt.lt_send_response = pci_vt9p_send; -+ sc->vsc_conn->lc_lt.lt_drop_response = pci_vt9p_drop; -+ -+ vi_softc_linkup(&sc->vsc_vs, &vt9p_vi_consts, sc, pi, &sc->vsc_vq); -+ sc->vsc_vs.vs_mtx = &sc->vsc_mtx; -+ sc->vsc_vq.vq_qsize = VT9P_RINGSZ; -+ -+ /* initialize config space */ -+ pci_set_cfgdata16(pi, PCIR_DEVICE, VIRTIO_DEV_9P); -+ pci_set_cfgdata16(pi, PCIR_VENDOR, VIRTIO_VENDOR); -+ pci_set_cfgdata8(pi, PCIR_CLASS, PCIC_STORAGE); -+ pci_set_cfgdata16(pi, PCIR_SUBDEV_0, VIRTIO_TYPE_9P); -+ pci_set_cfgdata16(pi, PCIR_SUBVEND_0, VIRTIO_VENDOR); -+ -+ if (vi_intr_init(&sc->vsc_vs, 1, fbsdrun_virtio_msix())) -+ return (1); -+ vi_set_io_bar(&sc->vsc_vs, 0); -+ -+ return (0); -+} -+ -+struct pci_devemu pci_de_v9p = { -+ .pe_emu = "virtio-9p", -+ .pe_init = pci_vt9p_init, -+ .pe_barwrite = vi_pci_write, -+ .pe_barread = vi_pci_read -+}; -+PCI_EMUL_SET(pci_de_v9p); ---- usr.sbin/bhyve/virtio.h.orig 2021-08-20 16:20:49 UTC -+++ usr.sbin/bhyve/virtio.h -@@ -215,6 +215,7 @@ struct vring_used { - #define VIRTIO_DEV_BLOCK 0x1001 - #define VIRTIO_DEV_RANDOM 0x1005 - #define VIRTIO_DEV_CONSOLE 0x1003 -+#define VIRTIO_DEV_9P 0x1009 - - /* - * PCI config space constants. diff --git a/sysutils/bhyve+/files/freebsd-11/patch-vtd-fix b/sysutils/bhyve+/files/freebsd-11/patch-vtd-fix deleted file mode 100644 index a5f2ce648941..000000000000 --- a/sysutils/bhyve+/files/freebsd-11/patch-vtd-fix +++ /dev/null @@ -1,211 +0,0 @@ ---- sys/amd64/vmm/intel/vtd.c -+++ sys/amd64/vmm/intel/vtd.c -@@ -51,6 +51,8 @@ __FBSDID("$FreeBSD$"); - * Architecture Spec, September 2008. - */ - -+#define VTD_DRHD_INCLUDE_PCI_ALL(Flags) (((Flags) >> 0) & 0x1) -+ - /* Section 10.4 "Register Descriptions" */ - struct vtdmap { - volatile uint32_t version; -@@ -116,10 +118,11 @@ struct domain { - static SLIST_HEAD(, domain) domhead; - - #define DRHD_MAX_UNITS 8 --static int drhd_num; --static struct vtdmap *vtdmaps[DRHD_MAX_UNITS]; --static int max_domains; --typedef int (*drhd_ident_func_t)(void); -+static ACPI_DMAR_HARDWARE_UNIT *drhds[DRHD_MAX_UNITS]; -+static int drhd_num; -+static struct vtdmap *vtdmaps[DRHD_MAX_UNITS]; -+static int max_domains; -+typedef int (*drhd_ident_func_t)(void); - - static uint64_t root_table[PAGE_SIZE / sizeof(uint64_t)] __aligned(4096); - static uint64_t ctx_tables[256][PAGE_SIZE / sizeof(uint64_t)] __aligned(4096); -@@ -175,6 +178,69 @@ domain_id(void) - return (id); - } - -+static struct vtdmap * -+vtd_device_scope(uint16_t rid) -+{ -+ int i, remaining, pathremaining; -+ char *end, *pathend; -+ struct vtdmap *vtdmap; -+ ACPI_DMAR_HARDWARE_UNIT *drhd; -+ ACPI_DMAR_DEVICE_SCOPE *device_scope; -+ ACPI_DMAR_PCI_PATH *path; -+ -+ for (i = 0; i < drhd_num; i++) { -+ drhd = drhds[i]; -+ -+ if (VTD_DRHD_INCLUDE_PCI_ALL(drhd->Flags)) { -+ /* -+ * From Intel VT-d arch spec, version 3.0: -+ * If a DRHD structure with INCLUDE_PCI_ALL flag Set is reported -+ * for a Segment, it must be enumerated by BIOS after all other -+ * DRHD structures for the same Segment. -+ */ -+ vtdmap = vtdmaps[i]; -+ return(vtdmap); -+ } -+ -+ end = (char *)drhd + drhd->Header.Length; -+ remaining = drhd->Header.Length - sizeof(ACPI_DMAR_HARDWARE_UNIT); -+ while (remaining > sizeof(ACPI_DMAR_DEVICE_SCOPE)) { -+ device_scope = (ACPI_DMAR_DEVICE_SCOPE *)(end - remaining); -+ remaining -= device_scope->Length; -+ -+ switch (device_scope->EntryType){ -+ /* 0x01 and 0x02 are PCI device entries */ -+ case 0x01: -+ case 0x02: -+ break; -+ default: -+ continue; -+ } -+ -+ if (PCI_RID2BUS(rid) != device_scope->Bus) -+ continue; -+ -+ pathend = (char *)device_scope + device_scope->Length; -+ pathremaining = device_scope->Length - sizeof(ACPI_DMAR_DEVICE_SCOPE); -+ while (pathremaining >= sizeof(ACPI_DMAR_PCI_PATH)) { -+ path = (ACPI_DMAR_PCI_PATH *)(pathend - pathremaining); -+ pathremaining -= sizeof(ACPI_DMAR_PCI_PATH); -+ -+ if (PCI_RID2SLOT(rid) != path->Device) -+ continue; -+ if (PCI_RID2FUNC(rid) != path->Function) -+ continue; -+ -+ vtdmap = vtdmaps[i]; -+ return (vtdmap); -+ } -+ } -+ } -+ -+ /* No matching scope */ -+ return (NULL); -+} -+ - static void - vtd_wbflush(struct vtdmap *vtdmap) - { -@@ -240,7 +306,7 @@ vtd_translation_disable(struct vtdmap *vtdmap) - static int - vtd_init(void) - { -- int i, units, remaining; -+ int i, units, remaining, tmp; - struct vtdmap *vtdmap; - vm_paddr_t ctx_paddr; - char *end, envname[32]; -@@ -291,8 +357,9 @@ vtd_init(void) - break; - - drhd = (ACPI_DMAR_HARDWARE_UNIT *)hdr; -- vtdmaps[units++] = (struct vtdmap *)PHYS_TO_DMAP(drhd->Address); -- if (units >= DRHD_MAX_UNITS) -+ drhds[units] = drhd; -+ vtdmaps[units] = (struct vtdmap *)PHYS_TO_DMAP(drhd->Address); -+ if (++units >= DRHD_MAX_UNITS) - break; - remaining -= hdr->Length; - } -@@ -302,12 +369,18 @@ vtd_init(void) - - skip_dmar: - drhd_num = units; -- vtdmap = vtdmaps[0]; - -- if (VTD_CAP_CM(vtdmap->cap) != 0) -- panic("vtd_init: invalid caching mode"); -+ max_domains = 64 * 1024; /* maximum valid value */ -+ for (i = 0; i < drhd_num; i++){ -+ vtdmap = vtdmaps[i]; -+ -+ if (VTD_CAP_CM(vtdmap->cap) != 0) -+ panic("vtd_init: invalid caching mode"); - -- max_domains = vtd_max_domains(vtdmap); -+ /* take most compatible (minimum) value */ -+ if ((tmp = vtd_max_domains(vtdmap)) < max_domains) -+ max_domains = tmp; -+ } - - /* - * Set up the root-table to point to the context-entry tables -@@ -373,7 +446,6 @@ vtd_add_device(void *arg, uint16_t rid) - struct vtdmap *vtdmap; - uint8_t bus; - -- vtdmap = vtdmaps[0]; - bus = PCI_RID2BUS(rid); - ctxp = ctx_tables[bus]; - pt_paddr = vtophys(dom->ptp); -@@ -385,6 +457,10 @@ vtd_add_device(void *arg, uint16_t rid) - (uint16_t)(ctxp[idx + 1] >> 8)); - } - -+ if ((vtdmap = vtd_device_scope(rid)) == NULL) -+ panic("vtd_add_device: device %x is not in scope for " -+ "any DMA remapping unit", rid); -+ - /* - * Order is important. The 'present' bit is set only after all fields - * of the context pointer are initialized. -@@ -568,8 +644,6 @@ vtd_create_domain(vm_paddr_t maxaddr) - if (drhd_num <= 0) - panic("vtd_create_domain: no dma remapping hardware available"); - -- vtdmap = vtdmaps[0]; -- - /* - * Calculate AGAW. - * Section 3.4.2 "Adjusted Guest Address Width", Architecture Spec. -@@ -594,7 +668,14 @@ vtd_create_domain(vm_paddr_t maxaddr) - pt_levels = 2; - sagaw = 30; - addrwidth = 0; -- tmp = VTD_CAP_SAGAW(vtdmap->cap); -+ -+ tmp = ~0; -+ for (i = 0; i < drhd_num; i++) { -+ vtdmap = vtdmaps[i]; -+ /* take most compatible value */ -+ tmp &= VTD_CAP_SAGAW(vtdmap->cap); -+ } -+ - for (i = 0; i < 5; i++) { - if ((tmp & (1 << i)) != 0 && sagaw >= agaw) - break; -@@ -606,8 +687,8 @@ vtd_create_domain(vm_paddr_t maxaddr) - } - - if (i >= 5) { -- panic("vtd_create_domain: SAGAW 0x%lx does not support AGAW %d", -- VTD_CAP_SAGAW(vtdmap->cap), agaw); -+ panic("vtd_create_domain: SAGAW 0x%x does not support AGAW %d", -+ tmp, agaw); - } - - dom = malloc(sizeof(struct domain), M_VTD, M_ZERO | M_WAITOK); -@@ -634,7 +715,12 @@ vtd_create_domain(vm_paddr_t maxaddr) - * There is not any code to deal with the demotion at the moment - * so we disable superpage mappings altogether. - */ -- dom->spsmask = VTD_CAP_SPS(vtdmap->cap); -+ dom->spsmask = ~0; -+ for (i = 0; i < drhd_num; i++) { -+ vtdmap = vtdmaps[i]; -+ /* take most compatible value */ -+ dom->spsmask &= VTD_CAP_SPS(vtdmap->cap); -+ } - #endif - - SLIST_INSERT_HEAD(&domhead, dom, next); - diff --git a/sysutils/cfengine-devel/files/patch-cf-execd_cf-execd-runagent.c b/sysutils/cfengine-devel/files/patch-cf-execd_cf-execd-runagent.c deleted file mode 100644 index 2c6b521ef5cf..000000000000 --- a/sysutils/cfengine-devel/files/patch-cf-execd_cf-execd-runagent.c +++ /dev/null @@ -1,15 +0,0 @@ ---- cf-execd/cf-execd-runagent.c.orig 2021-03-19 07:11:45.000000000 -0700 -+++ cf-execd/cf-execd-runagent.c 2021-03-24 01:35:29.063038000 -0700 -@@ -22,6 +22,12 @@ - included file COSL.txt. - */ - -+/* -+ * XXX: _WITH_GETLINE is required for FreeBSD-11. -+ * Remove when FreeBSD-11 is EOL. -+ */ -+#define _WITH_GETLINE -+ - #include <stdio.h> - - #include <logging.h> diff --git a/sysutils/cfengine318/files/patch-cf-execd_cf-execd-runagent.c b/sysutils/cfengine318/files/patch-cf-execd_cf-execd-runagent.c deleted file mode 100644 index 2c6b521ef5cf..000000000000 --- a/sysutils/cfengine318/files/patch-cf-execd_cf-execd-runagent.c +++ /dev/null @@ -1,15 +0,0 @@ ---- cf-execd/cf-execd-runagent.c.orig 2021-03-19 07:11:45.000000000 -0700 -+++ cf-execd/cf-execd-runagent.c 2021-03-24 01:35:29.063038000 -0700 -@@ -22,6 +22,12 @@ - included file COSL.txt. - */ - -+/* -+ * XXX: _WITH_GETLINE is required for FreeBSD-11. -+ * Remove when FreeBSD-11 is EOL. -+ */ -+#define _WITH_GETLINE -+ - #include <stdio.h> - - #include <logging.h> diff --git a/sysutils/crate/Makefile b/sysutils/crate/Makefile index 88d739888da0..184ae9fb3f8c 100644 --- a/sysutils/crate/Makefile +++ b/sysutils/crate/Makefile @@ -13,8 +13,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN= STL feature 'filesystem' isn't available # ' .endif -IGNORE_FreeBSD_11= getline isn't available on 11 by simply including <stdio.h> as its manpage says #' - BUILD_DEPENDS= rang>0:devel/rang LIB_DEPENDS= libyaml-cpp.so:devel/yaml-cpp diff --git a/sysutils/ddpt/Makefile b/sysutils/ddpt/Makefile index 12d2bc7c8e2a..dd9ddc7b715b 100644 --- a/sysutils/ddpt/Makefile +++ b/sysutils/ddpt/Makefile @@ -11,8 +11,6 @@ COMMENT= dd tool that specializes in files that are block devices LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_FreeBSD_11= lack of NVME_STATUS_GET_SCT and NVME_STATUS_GET_SC - USES= gmake tar:tgz USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/sysutils/dtrace-toolkit/Makefile b/sysutils/dtrace-toolkit/Makefile index 66751bf1d4a9..690ec4d67180 100644 --- a/sysutils/dtrace-toolkit/Makefile +++ b/sysutils/dtrace-toolkit/Makefile @@ -78,7 +78,7 @@ NO_BUILD= yes .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1200031 +.if ${OPSYS} == FreeBSD # lstat calls are no longer available on 12.0+ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-dtruss .endif diff --git a/sysutils/fluent-bit/Makefile b/sysutils/fluent-bit/Makefile index feac83661ccc..f1f1898d5773 100644 --- a/sysutils/fluent-bit/Makefile +++ b/sysutils/fluent-bit/Makefile @@ -40,10 +40,6 @@ USE_RC_SUBR= ${PORTNAME} .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200000 -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-lib_luajit__src__lj_prng.c -.endif - .if ${ARCH:Mpowerpc64*} CMAKE_ARGS+= -DFLB_LUAJIT:BOOL=OFF .elif ${ARCH} == powerpc diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 486e9f56f839..de77f0e4b07a 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -66,11 +66,6 @@ CHEESE_MESON_TRUE= cheese WAYLAND_MESON_TRUE= wayland WAYLAND_LIB_DEPENDS= libgudev-1.0.so:devel/libgudev -# This can be removed after 11.x is no longer supported -.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld) -LDFLAGS+= -fuse-ld=lld -.endif - .include <bsd.port.pre.mk> # FreeBSD base gained an os-release in r354922, but that does not exist diff --git a/sysutils/hexpeek/Makefile b/sysutils/hexpeek/Makefile index ccc444712229..5cdf0f72abc0 100644 --- a/sysutils/hexpeek/Makefile +++ b/sysutils/hexpeek/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= libedit ncurses tar:bzip2 USE_CSTD= c99 -CFLAGS+= -D_WITH_GETLINE -Isrc -L${LOCALBASE}/lib +CFLAGS+= -Isrc -L${LOCALBASE}/lib PLIST_FILES= bin/hexdiff \ bin/hexDump \ diff --git a/sysutils/hid-tools/Makefile b/sysutils/hid-tools/Makefile index 0821c27b3722..5988c231e3e3 100644 --- a/sysutils/hid-tools/Makefile +++ b/sysutils/hid-tools/Makefile @@ -10,8 +10,6 @@ COMMENT= Python scripts to manipulate HID data LICENSE= GPLv2 -IGNORE_FreeBSD_11= Is missing a hidraw(4) driver - RUN_DEPENDS_FreeBSD_12= iichid>=0.0.6:sysutils/iichid RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}parse>=0:textproc/py-parse@${PY_FLAVOR} \ diff --git a/sysutils/iichid/Makefile b/sysutils/iichid/Makefile index 81227fec74fc..df95ec155cd4 100644 --- a/sysutils/iichid/Makefile +++ b/sysutils/iichid/Makefile @@ -10,7 +10,6 @@ COMMENT= Generic FreeBSD HID layer for I2C and USB devices LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -IGNORE_FreeBSD_11= Requires FreeBSD 12.1 or later IGNORE_FreeBSD_13= Is a part of base system IGNORE_FreeBSD_14= Is a part of base system diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile index 8e71a14c43ea..3e0cf0113e60 100644 --- a/sysutils/ipmitool/Makefile +++ b/sysutils/ipmitool/Makefile @@ -48,7 +48,7 @@ FREEIPMI_CONFIGURE_ENABLE= intf-free .include <bsd.port.options.mk> -.if (${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085) || ${SSL_DEFAULT} == openssl +.if ${OPSYS} == FreeBSD || ${SSL_DEFAULT} == openssl EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src_plugins_lanplus_lanplus__crypt__impl.c .endif diff --git a/sysutils/keyd/Makefile b/sysutils/keyd/Makefile index aa20b3efa3e0..6cd6b262ad7c 100644 --- a/sysutils/keyd/Makefile +++ b/sysutils/keyd/Makefile @@ -18,7 +18,6 @@ USE_RC_SUBR= ${PORTNAME} GH_ACCOUNT= rvaiya MAKE_ARGS= DESTDIR="${DESTDIR}" PREFIX="${PREFIX}" \ GIT_HASH="${DISTVERSIONFULL}" -CFLAGS+= -D_WITH_GETLINE # XXX Remove after FreeBSD 11 EOL PLIST_FILES= bin/${PORTNAME} \ share/man/man1/${PORTNAME}.1.gz \ "@dir ${ETCDIR}" diff --git a/sysutils/kvmclock-kmod/Makefile b/sysutils/kvmclock-kmod/Makefile index 44f492b41c02..92bbb1de9989 100644 --- a/sysutils/kvmclock-kmod/Makefile +++ b/sysutils/kvmclock-kmod/Makefile @@ -8,7 +8,6 @@ COMMENT= Paravirtualized Linux KVM clock support LICENSE= BSD2CLAUSE -BROKEN_FreeBSD_11= fails to build: pvclock.c:248:30: error: too many arguments ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= not yet tested for non-x86 diff --git a/sysutils/libdnf/Makefile b/sysutils/libdnf/Makefile index 96fe9afc09a2..93494aaa5dc0 100644 --- a/sysutils/libdnf/Makefile +++ b/sysutils/libdnf/Makefile @@ -8,8 +8,6 @@ COMMENT= Dandified YUM, the next-generation version of YUM LICENSE= LGPL21 # no LICENSE tag for Version 2.1 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_FreeBSD_11= fatal error: sys/auxv.h: No such file or directory - BUILD_DEPENDS= check>0:devel/check LIB_DEPENDS= libassuan.so:security/libassuan \ libgpgme.so:security/gpgme \ diff --git a/sysutils/netevent/Makefile b/sysutils/netevent/Makefile index bfa064494186..59efab4158ed 100644 --- a/sysutils/netevent/Makefile +++ b/sysutils/netevent/Makefile @@ -16,7 +16,6 @@ USES= compiler:c++14-lang gmake localbase USE_GITHUB= yes GH_ACCOUNT= Blub HAS_CONFIGURE= yes -CPPFLAGS+= -D_WITH_GETLINE # XXX Remove after FreeBSD 11 EOL OPTIONS_DEFINE= EXAMPLES MANPAGES OPTIONS_DEFAULT= EXAMPLES MANPAGES diff --git a/sysutils/nsysctl/Makefile b/sysutils/nsysctl/Makefile index 56d562e10e0d..81f2b2044cd6 100644 --- a/sysutils/nsysctl/Makefile +++ b/sysutils/nsysctl/Makefile @@ -24,9 +24,6 @@ OPTIONS_DEFINE= DOCS EXAMPLES .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200019 -IGNORE= needs oid_label member of struct sysctl_oid defined in sysctl.h which was first introduced in FreeBSD 12 -.endif .if ${OPSYS} != FreeBSD IGNORE= not supported on anything but FreeBSD .endif diff --git a/sysutils/nvme-cli/Makefile b/sysutils/nvme-cli/Makefile index ad0aab3a4900..0344f4380e7d 100644 --- a/sysutils/nvme-cli/Makefile +++ b/sysutils/nvme-cli/Makefile @@ -12,7 +12,6 @@ LICENSE= GPLv2 # only tested on amd64, all other archs are no-go until we're sure amd64 works. # And there's plenty in amd64 that compiles, but won't run (eg using /sys/, etc) ONLY_FOR_ARCHS= amd64 -BROKEN_FreeBSD_11= Uses newer API than in 11.x USES= gmake USE_GITHUB= yes diff --git a/sysutils/openzfs-kmod/Makefile b/sysutils/openzfs-kmod/Makefile index f5fd1a59c94d..c6eff3e84be1 100644 --- a/sysutils/openzfs-kmod/Makefile +++ b/sysutils/openzfs-kmod/Makefile @@ -29,7 +29,7 @@ INVARIANTS_IMPLIES= DEBUG .include <bsd.port.pre.mk> -.if (${OSVERSION} < 1200504) || (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300013) +.if ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300013 IGNORE= needs FreeBSD 12/13 with AES-CCM support .endif diff --git a/sysutils/openzfs/Makefile b/sysutils/openzfs/Makefile index 3704d8edfe0e..dda366893501 100644 --- a/sysutils/openzfs/Makefile +++ b/sysutils/openzfs/Makefile @@ -29,7 +29,7 @@ GH_TAGNAME= ab15b1fc0 .include <bsd.port.pre.mk> -.if (${OSVERSION} < 1200504) || (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300013) +.if ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300013 IGNORE= needs FreeBSD 12/13 with AES-CCM support .endif diff --git a/sysutils/panicmail/Makefile b/sysutils/panicmail/Makefile index 1a5bb4ad9cd2..2828ee21f714 100644 --- a/sysutils/panicmail/Makefile +++ b/sysutils/panicmail/Makefile @@ -8,21 +8,16 @@ COMMENT= Automatically report kernel panics LICENSE= BSD2CLAUSE -RUN_DEPENDS= pkesh:security/pkesh +RUN_DEPENDS= pkesh:security/pkesh \ + ${LOCALBASE}/bin/gdb:devel/gdb NO_BUILD= yes PLIST_FILES= etc/rc.d/panicmail \ etc/cperciva-panicmail.pem -# Pull in gdb from ports for FreeBSD versions where it's not in base -.include <bsd.port.pre.mk> -.if ${OSVERSION} > 1200028 -RUN_DEPENDS+= ${LOCALBASE}/bin/gdb:devel/gdb -.endif - do-install: ${INSTALL_SCRIPT} ${WRKSRC}/panicmail ${STAGEDIR}${PREFIX}/etc/rc.d/ ${INSTALL_DATA} ${WRKSRC}/cperciva-panicmail.pem ${STAGEDIR}${PREFIX}/etc -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/py-azure-cli-core/Makefile b/sysutils/py-azure-cli-core/Makefile index 4e7124d22046..dfbb223d851b 100644 --- a/sysutils/py-azure-cli-core/Makefile +++ b/sysutils/py-azure-cli-core/Makefile @@ -1,6 +1,6 @@ PORTNAME= azure-cli-core PORTVERSION= 2.28.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -29,8 +29,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}adal>=1.2.7:net-mgmt/py-adal@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pkginfo>=1.5.0.1:sysutils/py-pkginfo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-core>=1.2.0<2.0.0:devel/py-azure-mgmt-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=5.8:sysutils/py-psutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} - # cryptography>=3.2<3.4 issue with py-openssl and py-cryptography on FreeBSD 11 + ${PYTHON_PKGNAMEPREFIX}cryptography>=3.2<3.4:security/py-cryptography@${PY_FLAVOR} USES= azurepy python:3.6+ USE_PYTHON= autoplist concurrent distutils diff --git a/sysutils/rshim-user-space/Makefile b/sysutils/rshim-user-space/Makefile index d8d8c52f6d9d..48fad1164d18 100644 --- a/sysutils/rshim-user-space/Makefile +++ b/sysutils/rshim-user-space/Makefile @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes .include <bsd.port.options.mk> -.if ${OPSYS} != FreeBSD || ${OSVERSION} < 1201500 || !exists(/usr/lib/libcuse.so) +.if ${OPSYS} != FreeBSD || !exists(/usr/lib/libcuse.so) IGNORE= not supported on this operating system combination .endif diff --git a/sysutils/sdparm/Makefile b/sysutils/sdparm/Makefile index 0e22c36938be..4c3edbc572d3 100644 --- a/sysutils/sdparm/Makefile +++ b/sysutils/sdparm/Makefile @@ -10,8 +10,6 @@ COMMENT= Utilities to access SCSI device parameters LICENSE= BSD3CLAUSE -BROKEN_FreeBSD_11= Lack of NVME_STATUS_GET_SCT - USE_LDCONFIG= yes USES= shebangfix tar:tgz GNU_CONFIGURE= yes diff --git a/sysutils/sleuthkit/Makefile b/sysutils/sleuthkit/Makefile index 2a82dbc25384..66638629e898 100644 --- a/sysutils/sleuthkit/Makefile +++ b/sysutils/sleuthkit/Makefile @@ -22,7 +22,6 @@ RUN_DEPENDS= p5-DateTime-TimeZone>=0:devel/p5-DateTime-TimeZone \ CONFLICTS= ja-ls-[0-9]* icat-[0-9]* -CPPFLAGS+= -D_WITH_GETLINE GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_header_libpq_fe_h=no USES= compiler:c++11-lang libtool perl5 sqlite diff --git a/sysutils/sysctlbyname-improved-kmod/Makefile b/sysutils/sysctlbyname-improved-kmod/Makefile index 62a91f3f3a0b..69e2966cb1f5 100644 --- a/sysutils/sysctlbyname-improved-kmod/Makefile +++ b/sysutils/sysctlbyname-improved-kmod/Makefile @@ -23,12 +23,6 @@ OPTIONS_DEFAULT= EXAMPLES .include <bsd.port.pre.mk> -# Once the sysctlinfo interface (review D21700) lands into the base tree this -# node can be added to the interface and the following statement needs -# to be expanded -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200019 -IGNORE= needs oid_label member of struct sysctl_oid defined in sysctl.h which was first introduced in FreeBSD 12 -.endif .if ${OPSYS} != FreeBSD IGNORE= not supported on anything but FreeBSD .endif diff --git a/sysutils/sysctlinfo-kmod/Makefile b/sysutils/sysctlinfo-kmod/Makefile index 304f7e2a3930..231e8566fbc5 100644 --- a/sysutils/sysctlinfo-kmod/Makefile +++ b/sysutils/sysctlinfo-kmod/Makefile @@ -26,11 +26,6 @@ OPTIONS_DEFAULT= EXAMPLES .include <bsd.port.pre.mk> -# Once the sysctlinfo interface (review D21700) lands into the base tree the -# following statement needs to be expanded -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200019 -IGNORE= needs oid_label member of struct sysctl_oid defined in sysctl.h which was first introduced in FreeBSD 12 -.endif .if ${OPSYS} != FreeBSD IGNORE= not supported on anything but FreeBSD .endif diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile index ab458b0ed58e..debd5e017919 100644 --- a/sysutils/tracker/Makefile +++ b/sysutils/tracker/Makefile @@ -42,9 +42,4 @@ BINARY_ALIAS= python3=${PYTHON_CMD} PLIST_SUB= LIBVER=0.304.0 -# This can be removed after 11.x is no longer supported -.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld) -LDFLAGS+= -fuse-ld=lld -.endif - .include <bsd.port.mk> diff --git a/sysutils/tracker3/Makefile b/sysutils/tracker3/Makefile index 363362ef1976..dc22e3263112 100644 --- a/sysutils/tracker3/Makefile +++ b/sysutils/tracker3/Makefile @@ -46,9 +46,4 @@ post-patch: ${REINPLACE_CMD} -e 's^/etc/asciidoc^${PREFIX}/etc/asciidoc^' \ ${WRKSRC}/docs/manpages/meson.build -# This can be removed after 11.x is no longer supported -.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld) -LDFLAGS+= -fuse-ld=lld -.endif - .include <bsd.port.mk> diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile index 7a6ebf06456d..48442f118c54 100644 --- a/sysutils/u-boot-master/Makefile +++ b/sysutils/u-boot-master/Makefile @@ -248,12 +248,4 @@ do-install: .endfor ${INSTALL_DATA} ${DESCR} ${STAGEDIR}/${INST}/README -.include <bsd.port.options.mk> - -.if defined(FAMILY) -.if ${FAMILY} == qemu && ${OPSYS} == FreeBSD && ${OSVERSION} <= 1200000 -BROKEN= Base openssl too old -.endif -.endif - .include <bsd.port.mk> diff --git a/sysutils/u-boot-sopine-spi/Makefile b/sysutils/u-boot-sopine-spi/Makefile index b72bdbcaad23..be0ea6e4436d 100644 --- a/sysutils/u-boot-sopine-spi/Makefile +++ b/sysutils/u-boot-sopine-spi/Makefile @@ -10,7 +10,6 @@ NO_METADATA= yes UBOOT_PLIST= u-boot-sunxi-with-spl.bin \ boot.scr PLIST_EXTRAS= sopine-spi-flasher.img -IGNORE_FreeBSD_11= No makefs msdos support post-build: mkimage -C none -A arm64 -T script -d ${.CURDIR}/../u-boot-sopine-spi/files/boot.cmd ${WRKSRC}/boot.scr diff --git a/sysutils/uhidd/files/patch-less-basename b/sysutils/uhidd/files/patch-less-basename deleted file mode 100644 index ce421a84592e..000000000000 --- a/sysutils/uhidd/files/patch-less-basename +++ /dev/null @@ -1,286 +0,0 @@ -commit ea1925e -Author: Jan Beich <jbeich@FreeBSD.org> -Date: Sun May 29 16:13:33 2016 +0000 - - Drop unused /dev/ prefix to unbreak FreeBSD 11.0 - - uhidd.c:291:16: error: passing 'const char *' to parameter of type 'char *' discards qualifiers - [-Werror,-Wincompatible-pointer-types-discards-qualifiers] - basename(hi->dev)); - ^~~~~~~ - /usr/include/libgen.h:38:22: note: passing argument to parameter here - char *basename(char *); - ^ - ---- uhidd/uhidd.c.orig 2012-10-14 19:53:44 UTC -+++ uhidd/uhidd.c -@@ -174,7 +174,7 @@ main(int argc, char **argv) - - STAILQ_INIT(&hilist); - -- if (find_device(*argv) < 0) { -+ if (find_device(basename(*argv)) < 0) { - eval = 1; - goto uhidd_end; - } -@@ -231,7 +231,7 @@ create_runtime_dir(void) - hi = STAILQ_FIRST(&hilist); - if (hi != NULL && hi->dev != NULL) { - snprintf(dpath, sizeof(dpath), "/var/run/uhidd.%s", -- basename(hi->dev)); -+ hi->dev); - mkdir(dpath, 0755); - } - } -@@ -247,7 +247,7 @@ remove_runtime_dir(void) - hi = STAILQ_FIRST(&hilist); - if (hi != NULL && hi->dev != NULL) { - snprintf(dpath, sizeof(dpath), "/var/run/uhidd.%s", -- basename(hi->dev)); -+ hi->dev); - if ((dir = opendir(dpath)) != NULL) { - while ((d = readdir(dir)) != NULL) { - snprintf(fpath, sizeof(fpath), "%s/%s", dpath, -@@ -286,7 +286,7 @@ find_device(const char *dev) - unsigned int bus, addr; - int ret; - -- if (sscanf(dev, "/dev/ugen%u.%u", &bus, &addr) < 2) { -+ if (sscanf(dev, "ugen%u.%u", &bus, &addr) < 2) { - syslog(LOG_ERR, "%s not found", dev); - return (-1); - } -@@ -405,7 +405,7 @@ open_iface(const char *dev, struct libus - e = libusb20_dev_request_sync(pdev, &req, rdesc, &actlen, 0, 0); - if (e) { - syslog(LOG_ERR, "%s[%d]=> libusb20_dev_request_sync" -- " failed", basename(dev), ndx); -+ " failed", dev, ndx); - return; - } - -@@ -497,7 +497,7 @@ alloc_hid_interface_be(struct hid_interf - - assert(hi != NULL); - -- if (sscanf(hi->dev, "/dev/ugen%u.%u", &bus, &addr) < 2) { -+ if (sscanf(hi->dev, "ugen%u.%u", &bus, &addr) < 2) { - syslog(LOG_ERR, "%s not found", hi->dev); - return (-1); - } -@@ -547,7 +547,7 @@ start_hid_interface(void *arg) - xfer = libusb20_tr_get_pointer(hi->pdev, x); - if (xfer == NULL) { - syslog(LOG_ERR, "%s[%d] libusb20_tr_get_pointer failed\n", -- basename(hi->dev), hi->ndx); -+ hi->dev, hi->ndx); - goto parent_end; - } - -@@ -556,7 +556,7 @@ start_hid_interface(void *arg) - PRINT1("xfer already opened\n"); - } else if (e) { - syslog(LOG_ERR, "%s[%d] libusb20_tr_open failed\n", -- basename(hi->dev), hi->ndx); -+ hi->dev, hi->ndx); - goto parent_end; - } - -@@ -628,14 +628,14 @@ hid_interrupt_out(void *context, int rep - xfer = libusb20_tr_get_pointer(hi->pdev, x); - if (xfer == NULL) { - syslog(LOG_ERR, "%s[%d] libusb20_tr_get_pointer failed\n", -- basename(hi->dev), hi->ndx); -+ hi->dev, hi->ndx); - return (-1); - } - - e = libusb20_tr_open(xfer, 4096, 1, XXX); /* FIXME */ - if (e && e != LIBUSB20_ERROR_BUSY) { - syslog(LOG_ERR, "%s[%d] libusb20_tr_open failed\n", -- basename(hi->dev), hi->ndx); -+ hi->dev, hi->ndx); - return (-1); - } - -@@ -720,12 +720,12 @@ hid_set_report(void *context, int report - e = libusb20_dev_request_sync(hi->pdev, &req, buf, &actlen, 0, 0); - if (e && verbose) - syslog(LOG_ERR, "%s[%d] libusb20_dev_request_sync failed", -- basename(hi->dev), hi->ndx); -+ hi->dev, hi->ndx); - try++; - } while (e && try < _SET_REPORT_RETRY); - if (e) { - syslog(LOG_ERR, "%s[%d] libusb20_dev_request_sync failed", -- basename(hi->dev), hi->ndx); -+ hi->dev, hi->ndx); - return (-1); - } - if (verbose) { ---- uhidd/uhidd.h.orig 2012-10-14 19:53:44 UTC -+++ uhidd/uhidd.h -@@ -227,7 +227,7 @@ struct hid_interface { - do { \ - char pb[64], pb2[1024]; \ - \ -- snprintf(pb, sizeof(pb), "%s[%d]", basename(d), n); \ -+ snprintf(pb, sizeof(pb), "%s[%d]", d, n); \ - snprintf(pb2, sizeof(pb2), __VA_ARGS__); \ - printf("%s-> %s", pb, pb2); \ - } while (0); -@@ -236,7 +236,7 @@ struct hid_interface { - do { \ - char pb[64], pb2[1024]; \ - \ -- snprintf(pb, sizeof(pb), "%s[%d]", basename(hi->dev), \ -+ snprintf(pb, sizeof(pb), "%s[%d]", hi->dev, \ - hi->ndx); \ - snprintf(pb2, sizeof(pb2), __VA_ARGS__); \ - printf("%s-> %s", pb, pb2); \ ---- uhidd/uhidd_cc.c.orig 2012-10-14 19:53:44 UTC -+++ uhidd/uhidd_cc.c -@@ -175,11 +175,11 @@ cc_write_keymap_file(struct hid_interfac - int i; - - snprintf(fpath, sizeof(fpath), "/var/run/uhidd.%s/cc_keymap", -- basename(hi->dev)); -+ hi->dev); - fp = fopen(fpath, "w+"); - if (fp == NULL) { - syslog(LOG_ERR, "%s[%d] fopen %s failed: %m", -- basename(hi->dev), hi->ndx, fpath); -+ hi->dev, hi->ndx, fpath); - return; - } - fprintf(fp, "0x%04x:0x%04x={\n", hi->vendor_id, hi->product_id); ---- uhidd/uhidd_kbd.c.orig 2012-10-14 19:53:44 UTC -+++ uhidd/uhidd_kbd.c -@@ -582,7 +582,7 @@ kbd_attach(struct hid_appcol *ha) - /* Open /dev/vkbdctl. */ - if ((kd->vkbd_fd = open("/dev/vkbdctl", O_RDWR)) < 0) { - syslog(LOG_ERR, "%s[%d] could not open /dev/vkbdctl: %m", -- basename(hi->dev), hi->ndx); -+ hi->dev, hi->ndx); - if (verbose && errno == ENOENT) - PRINT1("vkbd.ko kernel module not loaded?\n") - return (-1); -@@ -591,7 +591,7 @@ kbd_attach(struct hid_appcol *ha) - if (verbose) { - if (fstat(kd->vkbd_fd, &sb) < 0) { - syslog(LOG_ERR, "%s[%d] fstat: /dev/vkbdctl: %m", -- basename(hi->dev), hi->ndx); -+ hi->dev, hi->ndx); - return (-1); - } - PRINT1("kbd device name: %s\n", devname(sb.st_rdev, S_IFCHR)); ---- uhidd/uhidd_mouse.c.orig 2012-10-14 19:53:44 UTC -+++ uhidd/uhidd_mouse.c -@@ -91,7 +91,7 @@ mouse_attach(struct hid_appcol *ha) - md->cons_fd = open("/dev/consolectl", O_RDWR); - if (md->cons_fd < 0) { - syslog(LOG_ERR, "%s[%d] could not open /dev/consolectl: %m", -- basename(hi->dev), hi->ndx); -+ hi->dev, hi->ndx); - return (-1); - } - -@@ -212,5 +212,5 @@ mouse_recv(struct hid_appcol *ha, struct - - if (ioctl(md->cons_fd, CONS_MOUSECTL, &mi) < 0) - syslog(LOG_ERR, "%s[%d] could not submit mouse data:" -- " ioctl failed: %m", basename(hi->dev), hi->ndx); -+ " ioctl failed: %m", hi->dev, hi->ndx); - } ---- uhidd/uhidd_vhid.c.orig 2012-10-14 19:53:44 UTC -+++ uhidd/uhidd_vhid.c -@@ -97,7 +97,7 @@ vhid_attach(struct hid_appcol *ha) - */ - if ((vd->vd_fd = open("/dev/uvhidctl", O_RDWR)) < 0) { - syslog(LOG_ERR, "%s[%d] could not open /dev/uvhidctl: %m", -- basename(hi->dev), hi->ndx); -+ hi->dev, hi->ndx); - if (verbose && errno == ENOENT) - PRINT1("uvhid.ko kernel moduel not loaded?\n") - return (-1); -@@ -105,13 +105,13 @@ vhid_attach(struct hid_appcol *ha) - - if (fstat(vd->vd_fd, &sb) < 0) { - syslog(LOG_ERR, "%s[%d] fstat: /dev/uvhidctl: %m", -- basename(hi->dev), hi->ndx); -+ hi->dev, hi->ndx); - close(vd->vd_fd); - return (-1); - } - - if ((vd->vd_name = strdup(devname(sb.st_rdev, S_IFCHR))) == NULL) { -- syslog(LOG_ERR, "%s[%d] strdup failed: %m", basename(hi->dev), -+ syslog(LOG_ERR, "%s[%d] strdup failed: %m", hi->dev, - hi->ndx); - close(vd->vd_fd); - return (-1); -@@ -129,7 +129,7 @@ vhid_attach(struct hid_appcol *ha) - - if (ioctl(vd->vd_fd, USB_SET_REPORT_DESC, &ugd) < 0) { - syslog(LOG_ERR, "%s[%d] ioctl(USB_SET_REPORT_DESC): %m", -- basename(hi->dev), hi->ndx); -+ hi->dev, hi->ndx); - return (-1); - } - -@@ -148,7 +148,7 @@ vhid_attach(struct hid_appcol *ha) - - if (ioctl(vd->vd_fd, USB_SET_REPORT_ID, &vd->vd_rid) < 0) { - syslog(LOG_ERR, "%s[%d] ioctl(USB_SET_REPORT_ID): %m", -- basename(hi->dev), hi->ndx); -+ hi->dev, hi->ndx); - return (-1); - } - -@@ -156,7 +156,7 @@ vhid_attach(struct hid_appcol *ha) - e = pthread_create(&vd->vd_task, NULL, vhid_task, (void *) ha); - if (e) { - syslog(LOG_ERR, "%s[%d] pthread_create failed: %m", -- basename(hi->dev), hi->ndx); -+ hi->dev, hi->ndx); - close(vd->vd_fd); - return (-1); - } -@@ -189,7 +189,7 @@ vhid_recv_raw(struct hid_appcol *ha, uin - } - - if (write(vd->vd_fd, buf, len) < 0) -- syslog(LOG_ERR, "%s[%d] write failed: %m", basename(hi->dev), -+ syslog(LOG_ERR, "%s[%d] write failed: %m", hi->dev, - hi->ndx); - } - -@@ -217,7 +217,7 @@ vhid_task(void *arg) - continue; - } - if (verbose) { -- PRINT1("%s[%d] vhid_task recevied:", basename(hi->dev), -+ PRINT1("%s[%d] vhid_task recevied:", hi->dev, - hi->ndx); - for (i = 0; i < len; i++) - printf("%d ", buf[i]); ---- uhidd/uhidd_vhid_cuse.c.orig 2012-10-14 19:53:44 UTC -+++ uhidd/uhidd_vhid_cuse.c -@@ -192,7 +192,7 @@ vhid_attach(struct hid_appcol *ha) - vd->vd_rsz = ha->ha_rsz; - } else { - syslog(LOG_ERR, "%s[%d] report descriptor too big!", -- basename(hi->dev), hi->ndx); -+ hi->dev, hi->ndx); - return (-1); - } - -@@ -468,7 +468,7 @@ vhid_write(struct cuse_dev *cdev, int ff - goto write_done; - - if (verbose) { -- PRINT1("%s[%d] vhid_task recevied:", basename(hi->dev), -+ PRINT1("%s[%d] vhid_task recevied:", hi->dev, - hi->ndx); - for (i = 0; i < len; i++) - printf("%d ", buf[i]); diff --git a/sysutils/xen-tools/Makefile b/sysutils/xen-tools/Makefile index 17a94b7c0a3c..1562d79f2218 100644 --- a/sysutils/xen-tools/Makefile +++ b/sysutils/xen-tools/Makefile @@ -65,10 +65,6 @@ DOCS_INSTALL_TARGET= install-docs IGNORE= only supported on FreeBSD .endif -.if ${OSVERSION} < 1200074 -IGNORE= only supported on FreeBSD 12.0 or newer -.endif - .if ${PORT_OPTIONS:MSPICE} && ${OSVERSION} < 1300008 BROKEN= SPICE support requires FreeBSD version 13.0 or higher .endif diff --git a/sysutils/ztop/Makefile b/sysutils/ztop/Makefile index 5c07d6ea0727..82173a2b6f95 100644 --- a/sysutils/ztop/Makefile +++ b/sysutils/ztop/Makefile @@ -10,8 +10,6 @@ COMMENT= Display ZFS dataset I/O in real time LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -IGNORE_FreeBSD_11= lacks required kernel functionality - USES= cargo USE_GITHUB= yes GH_ACCOUNT= asomers |