Page MenuHomeFreeBSD
Differential D17939

net/rabbiteer: fix openssl 1.1.1 breakage - rabbiteer uses a library that uses a library that provides OpenSSL - amqp library is EWONTFIX so purge the OpenSSL patches until whenever
ClosedPublic
Actions

Authored by dch on Nov 10 2018, 11:01 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 11, 5:56 AM
Unknown Object (File)
Fri, Feb 21, 10:39 PM
Unknown Object (File)
Feb 18 2025, 5:38 PM
Unknown Object (File)
Feb 11 2025, 4:59 AM
Unknown Object (File)
Dec 30 2024, 2:38 AM
Unknown Object (File)
Dec 25 2024, 4:40 AM
Unknown Object (File)
Nov 30 2024, 7:20 AM
Unknown Object (File)
Nov 25 2024, 8:41 AM
View All 35 Files
Subscribers
None

Details

Reviewers
jrm
Commits
rP485293: net/rabbiteer: fix openssl 1.1.1 breakage
Test Plan

works with make package but now we have rust 1.30.1 ... waiting for poudriere

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

dch created this revision.Nov 10 2018, 11:01 PM
Harbormaster completed remote builds in B20745: Diff 50271.Nov 10 2018, 11:01 PM
dch added a comment.Nov 14 2018, 12:31 PM

@jrm this passes local poudriere, needs your rubber stamp or your nit-stick.

jrm accepted this revision.Nov 14 2018, 12:41 PM

I don't see any nits to pick. :)

This revision is now accepted and ready to land.Nov 14 2018, 12:41 PM
Closed by commit rP485293: net/rabbiteer: fix openssl 1.1.1 breakage (authored by dch). · Explain WhyNov 19 2018, 1:11 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
head/
net/
rabbiteer/
25 lines
34 lines
files/
282 lines
17 lines

Diff 50576

View Options

head/net/rabbiteer/Makefile

Show First 20 Lines • Show All 220 Lines • ▼ Show 20 Lines
static void vtcon_tty_free(void *); static void vtcon_tty_free(void *);
static void vtcon_get_console_size(struct vtcon_softc *, uint16_t *, static void vtcon_get_console_size(struct vtcon_softc *, uint16_t *,
uint16_t *); uint16_t *);
static void vtcon_enable_interrupts(struct vtcon_softc *); static void vtcon_enable_interrupts(struct vtcon_softc *);
static void vtcon_disable_interrupts(struct vtcon_softc *); static void vtcon_disable_interrupts(struct vtcon_softc *);
#define vtcon_modern(_sc) (((_sc)->vtcon_features & VIRTIO_F_VERSION_1) != 0)
#define vtcon_htog16(_sc, _val) virtio_htog16(vtcon_modern(_sc), _val)
#define vtcon_htog32(_sc, _val) virtio_htog32(vtcon_modern(_sc), _val)
#define vtcon_htog64(_sc, _val) virtio_htog64(vtcon_modern(_sc), _val)
#define vtcon_gtoh16(_sc, _val) virtio_gtoh16(vtcon_modern(_sc), _val)
#define vtcon_gtoh32(_sc, _val) virtio_gtoh32(vtcon_modern(_sc), _val)
#define vtcon_gtoh64(_sc, _val) virtio_gtoh64(vtcon_modern(_sc), _val)
static int vtcon_pending_free; static int vtcon_pending_free;
static struct ttydevsw vtcon_tty_class = { static struct ttydevsw vtcon_tty_class = {
.tsw_flags = 0, .tsw_flags = 0,
.tsw_open = vtcon_tty_open, .tsw_open = vtcon_tty_open,
.tsw_close = vtcon_tty_close, .tsw_close = vtcon_tty_close,
.tsw_outwakeup = vtcon_tty_outwakeup, .tsw_outwakeup = vtcon_tty_outwakeup,
.tsw_free = vtcon_tty_free, .tsw_free = vtcon_tty_free,
▲ Show 20 Lines • Show All 188 Lines • ▼ Show 20 Lines
{ {
device_t dev; device_t dev;
uint64_t features; uint64_t features;
dev = sc->vtcon_dev; dev = sc->vtcon_dev;
features = VTCON_FEATURES; features = VTCON_FEATURES;
sc->vtcon_features = virtio_negotiate_features(dev, features); sc->vtcon_features = virtio_negotiate_features(dev, features);
virtio_finalize_features(dev);
} }
static void static void
vtcon_setup_features(struct vtcon_softc *sc) vtcon_setup_features(struct vtcon_softc *sc)
{ {
device_t dev; device_t dev;
dev = sc->vtcon_dev; dev = sc->vtcon_dev;
▲ Show 20 Lines • Show All 400 Lines • ▼ Show 20 Linesvtcon_ctrl_port_name_event(struct vtcon_softc *sc, int id, const char *name,
VTCON_PORT_UNLOCK(port); VTCON_PORT_UNLOCK(port);
} }
static void static void
vtcon_ctrl_process_event(struct vtcon_softc *sc, vtcon_ctrl_process_event(struct vtcon_softc *sc,
struct virtio_console_control *control, void *data, size_t data_len) struct virtio_console_control *control, void *data, size_t data_len)
{ {
device_t dev; device_t dev;
int id; uint32_t id;
uint16_t event;
dev = sc->vtcon_dev; dev = sc->vtcon_dev;
id = control->id; id = vtcon_htog32(sc, control->id);
event = vtcon_htog16(sc, control->event);
if (id < 0 || id >= sc->vtcon_max_ports) { if (id >= sc->vtcon_max_ports) {
device_printf(dev, "%s: invalid port ID %d\n", __func__, id); device_printf(dev, "%s: event %d invalid port ID %d\n",
__func__, event, id);
return; return;
} }
switch (control->event) { switch (event) {
case VIRTIO_CONSOLE_PORT_ADD: case VIRTIO_CONSOLE_PORT_ADD:
vtcon_ctrl_port_add_event(sc, id); vtcon_ctrl_port_add_event(sc, id);
break; break;
case VIRTIO_CONSOLE_PORT_REMOVE: case VIRTIO_CONSOLE_PORT_REMOVE:
vtcon_ctrl_port_remove_event(sc, id); vtcon_ctrl_port_remove_event(sc, id);
break; break;
▲ Show 20 Lines • Show All 111 Lines • ▼ Show 20 Lines
vtcon_ctrl_send_control(struct vtcon_softc *sc, uint32_t portid, vtcon_ctrl_send_control(struct vtcon_softc *sc, uint32_t portid,
uint16_t event, uint16_t value) uint16_t event, uint16_t value)
{ {
struct virtio_console_control control; struct virtio_console_control control;
if ((sc->vtcon_flags & VTCON_FLAG_MULTIPORT) == 0) if ((sc->vtcon_flags & VTCON_FLAG_MULTIPORT) == 0)
return; return;
control.id = portid; control.id = vtcon_gtoh32(sc, portid);
control.event = event; control.event = vtcon_gtoh16(sc, event);
control.value = value; control.value = vtcon_gtoh16(sc, value);
vtcon_ctrl_poll(sc, &control); vtcon_ctrl_poll(sc, &control);
} }
static int static int
vtcon_port_enqueue_buf(struct vtcon_port *port, void *buf, size_t len) vtcon_port_enqueue_buf(struct vtcon_port *port, void *buf, size_t len)
{ {
struct sglist_seg segs[2]; struct sglist_seg segs[2];
▲ Show 20 Lines • Show All 504 Lines • Show Last 20 Lines
View Options

head/net/rabbiteer/distinfo

Show First 20 Lines • Show All 220 Lines • ▼ Show 20 Lines
static void vtcon_tty_free(void *); static void vtcon_tty_free(void *);
static void vtcon_get_console_size(struct vtcon_softc *, uint16_t *, static void vtcon_get_console_size(struct vtcon_softc *, uint16_t *,
uint16_t *); uint16_t *);
static void vtcon_enable_interrupts(struct vtcon_softc *); static void vtcon_enable_interrupts(struct vtcon_softc *);
static void vtcon_disable_interrupts(struct vtcon_softc *); static void vtcon_disable_interrupts(struct vtcon_softc *);
#define vtcon_modern(_sc) (((_sc)->vtcon_features & VIRTIO_F_VERSION_1) != 0)
#define vtcon_htog16(_sc, _val) virtio_htog16(vtcon_modern(_sc), _val)
#define vtcon_htog32(_sc, _val) virtio_htog32(vtcon_modern(_sc), _val)
#define vtcon_htog64(_sc, _val) virtio_htog64(vtcon_modern(_sc), _val)
#define vtcon_gtoh16(_sc, _val) virtio_gtoh16(vtcon_modern(_sc), _val)
#define vtcon_gtoh32(_sc, _val) virtio_gtoh32(vtcon_modern(_sc), _val)
#define vtcon_gtoh64(_sc, _val) virtio_gtoh64(vtcon_modern(_sc), _val)
static int vtcon_pending_free; static int vtcon_pending_free;
static struct ttydevsw vtcon_tty_class = { static struct ttydevsw vtcon_tty_class = {
.tsw_flags = 0, .tsw_flags = 0,
.tsw_open = vtcon_tty_open, .tsw_open = vtcon_tty_open,
.tsw_close = vtcon_tty_close, .tsw_close = vtcon_tty_close,
.tsw_outwakeup = vtcon_tty_outwakeup, .tsw_outwakeup = vtcon_tty_outwakeup,
.tsw_free = vtcon_tty_free, .tsw_free = vtcon_tty_free,
▲ Show 20 Lines • Show All 188 Lines • ▼ Show 20 Lines
{ {
device_t dev; device_t dev;
uint64_t features; uint64_t features;
dev = sc->vtcon_dev; dev = sc->vtcon_dev;
features = VTCON_FEATURES; features = VTCON_FEATURES;
sc->vtcon_features = virtio_negotiate_features(dev, features); sc->vtcon_features = virtio_negotiate_features(dev, features);
virtio_finalize_features(dev);
} }
static void static void
vtcon_setup_features(struct vtcon_softc *sc) vtcon_setup_features(struct vtcon_softc *sc)
{ {
device_t dev; device_t dev;
dev = sc->vtcon_dev; dev = sc->vtcon_dev;
▲ Show 20 Lines • Show All 400 Lines • ▼ Show 20 Linesvtcon_ctrl_port_name_event(struct vtcon_softc *sc, int id, const char *name,
VTCON_PORT_UNLOCK(port); VTCON_PORT_UNLOCK(port);
} }
static void static void
vtcon_ctrl_process_event(struct vtcon_softc *sc, vtcon_ctrl_process_event(struct vtcon_softc *sc,
struct virtio_console_control *control, void *data, size_t data_len) struct virtio_console_control *control, void *data, size_t data_len)
{ {
device_t dev; device_t dev;
int id; uint32_t id;
uint16_t event;
dev = sc->vtcon_dev; dev = sc->vtcon_dev;
id = control->id; id = vtcon_htog32(sc, control->id);
event = vtcon_htog16(sc, control->event);
if (id < 0 || id >= sc->vtcon_max_ports) { if (id >= sc->vtcon_max_ports) {
device_printf(dev, "%s: invalid port ID %d\n", __func__, id); device_printf(dev, "%s: event %d invalid port ID %d\n",
__func__, event, id);
return; return;
} }
switch (control->event) { switch (event) {
case VIRTIO_CONSOLE_PORT_ADD: case VIRTIO_CONSOLE_PORT_ADD:
vtcon_ctrl_port_add_event(sc, id); vtcon_ctrl_port_add_event(sc, id);
break; break;
case VIRTIO_CONSOLE_PORT_REMOVE: case VIRTIO_CONSOLE_PORT_REMOVE:
vtcon_ctrl_port_remove_event(sc, id); vtcon_ctrl_port_remove_event(sc, id);
break; break;
▲ Show 20 Lines • Show All 111 Lines • ▼ Show 20 Lines
vtcon_ctrl_send_control(struct vtcon_softc *sc, uint32_t portid, vtcon_ctrl_send_control(struct vtcon_softc *sc, uint32_t portid,
uint16_t event, uint16_t value) uint16_t event, uint16_t value)
{ {
struct virtio_console_control control; struct virtio_console_control control;
if ((sc->vtcon_flags & VTCON_FLAG_MULTIPORT) == 0) if ((sc->vtcon_flags & VTCON_FLAG_MULTIPORT) == 0)
return; return;
control.id = portid; control.id = vtcon_gtoh32(sc, portid);
control.event = event; control.event = vtcon_gtoh16(sc, event);
control.value = value; control.value = vtcon_gtoh16(sc, value);
vtcon_ctrl_poll(sc, &control); vtcon_ctrl_poll(sc, &control);
} }
static int static int
vtcon_port_enqueue_buf(struct vtcon_port *port, void *buf, size_t len) vtcon_port_enqueue_buf(struct vtcon_port *port, void *buf, size_t len)
{ {
struct sglist_seg segs[2]; struct sglist_seg segs[2];
▲ Show 20 Lines • Show All 504 Lines • Show Last 20 Lines
View Options

head/net/rabbiteer/files/patch-Cargo.lock

Show First 20 Lines • Show All 220 Lines • ▼ Show 20 Lines
static void vtcon_tty_free(void *); static void vtcon_tty_free(void *);
static void vtcon_get_console_size(struct vtcon_softc *, uint16_t *, static void vtcon_get_console_size(struct vtcon_softc *, uint16_t *,
uint16_t *); uint16_t *);
static void vtcon_enable_interrupts(struct vtcon_softc *); static void vtcon_enable_interrupts(struct vtcon_softc *);
static void vtcon_disable_interrupts(struct vtcon_softc *); static void vtcon_disable_interrupts(struct vtcon_softc *);
#define vtcon_modern(_sc) (((_sc)->vtcon_features & VIRTIO_F_VERSION_1) != 0)
#define vtcon_htog16(_sc, _val) virtio_htog16(vtcon_modern(_sc), _val)
#define vtcon_htog32(_sc, _val) virtio_htog32(vtcon_modern(_sc), _val)
#define vtcon_htog64(_sc, _val) virtio_htog64(vtcon_modern(_sc), _val)
#define vtcon_gtoh16(_sc, _val) virtio_gtoh16(vtcon_modern(_sc), _val)
#define vtcon_gtoh32(_sc, _val) virtio_gtoh32(vtcon_modern(_sc), _val)
#define vtcon_gtoh64(_sc, _val) virtio_gtoh64(vtcon_modern(_sc), _val)
static int vtcon_pending_free; static int vtcon_pending_free;
static struct ttydevsw vtcon_tty_class = { static struct ttydevsw vtcon_tty_class = {
.tsw_flags = 0, .tsw_flags = 0,
.tsw_open = vtcon_tty_open, .tsw_open = vtcon_tty_open,
.tsw_close = vtcon_tty_close, .tsw_close = vtcon_tty_close,
.tsw_outwakeup = vtcon_tty_outwakeup, .tsw_outwakeup = vtcon_tty_outwakeup,
.tsw_free = vtcon_tty_free, .tsw_free = vtcon_tty_free,
▲ Show 20 Lines • Show All 188 Lines • ▼ Show 20 Lines
{ {
device_t dev; device_t dev;
uint64_t features; uint64_t features;
dev = sc->vtcon_dev; dev = sc->vtcon_dev;
features = VTCON_FEATURES; features = VTCON_FEATURES;
sc->vtcon_features = virtio_negotiate_features(dev, features); sc->vtcon_features = virtio_negotiate_features(dev, features);
virtio_finalize_features(dev);
} }
static void static void
vtcon_setup_features(struct vtcon_softc *sc) vtcon_setup_features(struct vtcon_softc *sc)
{ {
device_t dev; device_t dev;
dev = sc->vtcon_dev; dev = sc->vtcon_dev;
▲ Show 20 Lines • Show All 400 Lines • ▼ Show 20 Linesvtcon_ctrl_port_name_event(struct vtcon_softc *sc, int id, const char *name,
VTCON_PORT_UNLOCK(port); VTCON_PORT_UNLOCK(port);
} }
static void static void
vtcon_ctrl_process_event(struct vtcon_softc *sc, vtcon_ctrl_process_event(struct vtcon_softc *sc,
struct virtio_console_control *control, void *data, size_t data_len) struct virtio_console_control *control, void *data, size_t data_len)
{ {
device_t dev; device_t dev;
int id; uint32_t id;
uint16_t event;
dev = sc->vtcon_dev; dev = sc->vtcon_dev;
id = control->id; id = vtcon_htog32(sc, control->id);
event = vtcon_htog16(sc, control->event);
if (id < 0 || id >= sc->vtcon_max_ports) { if (id >= sc->vtcon_max_ports) {
device_printf(dev, "%s: invalid port ID %d\n", __func__, id); device_printf(dev, "%s: event %d invalid port ID %d\n",
__func__, event, id);
return; return;
} }
switch (control->event) { switch (event) {
case VIRTIO_CONSOLE_PORT_ADD: case VIRTIO_CONSOLE_PORT_ADD:
vtcon_ctrl_port_add_event(sc, id); vtcon_ctrl_port_add_event(sc, id);
break; break;
case VIRTIO_CONSOLE_PORT_REMOVE: case VIRTIO_CONSOLE_PORT_REMOVE:
vtcon_ctrl_port_remove_event(sc, id); vtcon_ctrl_port_remove_event(sc, id);
break; break;
▲ Show 20 Lines • Show All 111 Lines • ▼ Show 20 Lines
vtcon_ctrl_send_control(struct vtcon_softc *sc, uint32_t portid, vtcon_ctrl_send_control(struct vtcon_softc *sc, uint32_t portid,
uint16_t event, uint16_t value) uint16_t event, uint16_t value)
{ {
struct virtio_console_control control; struct virtio_console_control control;
if ((sc->vtcon_flags & VTCON_FLAG_MULTIPORT) == 0) if ((sc->vtcon_flags & VTCON_FLAG_MULTIPORT) == 0)
return; return;
control.id = portid; control.id = vtcon_gtoh32(sc, portid);
control.event = event; control.event = vtcon_gtoh16(sc, event);
control.value = value; control.value = vtcon_gtoh16(sc, value);
vtcon_ctrl_poll(sc, &control); vtcon_ctrl_poll(sc, &control);
} }
static int static int
vtcon_port_enqueue_buf(struct vtcon_port *port, void *buf, size_t len) vtcon_port_enqueue_buf(struct vtcon_port *port, void *buf, size_t len)
{ {
struct sglist_seg segs[2]; struct sglist_seg segs[2];
▲ Show 20 Lines • Show All 504 Lines • Show Last 20 Lines
View Options

head/net/rabbiteer/files/patch-Cargo.toml

Show First 20 Lines • Show All 220 Lines • ▼ Show 20 Lines
static void vtcon_tty_free(void *); static void vtcon_tty_free(void *);
static void vtcon_get_console_size(struct vtcon_softc *, uint16_t *, static void vtcon_get_console_size(struct vtcon_softc *, uint16_t *,
uint16_t *); uint16_t *);
static void vtcon_enable_interrupts(struct vtcon_softc *); static void vtcon_enable_interrupts(struct vtcon_softc *);
static void vtcon_disable_interrupts(struct vtcon_softc *); static void vtcon_disable_interrupts(struct vtcon_softc *);
#define vtcon_modern(_sc) (((_sc)->vtcon_features & VIRTIO_F_VERSION_1) != 0)
#define vtcon_htog16(_sc, _val) virtio_htog16(vtcon_modern(_sc), _val)
#define vtcon_htog32(_sc, _val) virtio_htog32(vtcon_modern(_sc), _val)
#define vtcon_htog64(_sc, _val) virtio_htog64(vtcon_modern(_sc), _val)
#define vtcon_gtoh16(_sc, _val) virtio_gtoh16(vtcon_modern(_sc), _val)
#define vtcon_gtoh32(_sc, _val) virtio_gtoh32(vtcon_modern(_sc), _val)
#define vtcon_gtoh64(_sc, _val) virtio_gtoh64(vtcon_modern(_sc), _val)
static int vtcon_pending_free; static int vtcon_pending_free;
static struct ttydevsw vtcon_tty_class = { static struct ttydevsw vtcon_tty_class = {
.tsw_flags = 0, .tsw_flags = 0,
.tsw_open = vtcon_tty_open, .tsw_open = vtcon_tty_open,
.tsw_close = vtcon_tty_close, .tsw_close = vtcon_tty_close,
.tsw_outwakeup = vtcon_tty_outwakeup, .tsw_outwakeup = vtcon_tty_outwakeup,
.tsw_free = vtcon_tty_free, .tsw_free = vtcon_tty_free,
▲ Show 20 Lines • Show All 188 Lines • ▼ Show 20 Lines
{ {
device_t dev; device_t dev;
uint64_t features; uint64_t features;
dev = sc->vtcon_dev; dev = sc->vtcon_dev;
features = VTCON_FEATURES; features = VTCON_FEATURES;
sc->vtcon_features = virtio_negotiate_features(dev, features); sc->vtcon_features = virtio_negotiate_features(dev, features);
virtio_finalize_features(dev);
} }
static void static void
vtcon_setup_features(struct vtcon_softc *sc) vtcon_setup_features(struct vtcon_softc *sc)
{ {
device_t dev; device_t dev;
dev = sc->vtcon_dev; dev = sc->vtcon_dev;
▲ Show 20 Lines • Show All 400 Lines • ▼ Show 20 Linesvtcon_ctrl_port_name_event(struct vtcon_softc *sc, int id, const char *name,
VTCON_PORT_UNLOCK(port); VTCON_PORT_UNLOCK(port);
} }
static void static void
vtcon_ctrl_process_event(struct vtcon_softc *sc, vtcon_ctrl_process_event(struct vtcon_softc *sc,
struct virtio_console_control *control, void *data, size_t data_len) struct virtio_console_control *control, void *data, size_t data_len)
{ {
device_t dev; device_t dev;
int id; uint32_t id;
uint16_t event;
dev = sc->vtcon_dev; dev = sc->vtcon_dev;
id = control->id; id = vtcon_htog32(sc, control->id);
event = vtcon_htog16(sc, control->event);
if (id < 0 || id >= sc->vtcon_max_ports) { if (id >= sc->vtcon_max_ports) {
device_printf(dev, "%s: invalid port ID %d\n", __func__, id); device_printf(dev, "%s: event %d invalid port ID %d\n",
__func__, event, id);
return; return;
} }
switch (control->event) { switch (event) {
case VIRTIO_CONSOLE_PORT_ADD: case VIRTIO_CONSOLE_PORT_ADD:
vtcon_ctrl_port_add_event(sc, id); vtcon_ctrl_port_add_event(sc, id);
break; break;
case VIRTIO_CONSOLE_PORT_REMOVE: case VIRTIO_CONSOLE_PORT_REMOVE:
vtcon_ctrl_port_remove_event(sc, id); vtcon_ctrl_port_remove_event(sc, id);
break; break;
▲ Show 20 Lines • Show All 111 Lines • ▼ Show 20 Lines
vtcon_ctrl_send_control(struct vtcon_softc *sc, uint32_t portid, vtcon_ctrl_send_control(struct vtcon_softc *sc, uint32_t portid,
uint16_t event, uint16_t value) uint16_t event, uint16_t value)
{ {
struct virtio_console_control control; struct virtio_console_control control;
if ((sc->vtcon_flags & VTCON_FLAG_MULTIPORT) == 0) if ((sc->vtcon_flags & VTCON_FLAG_MULTIPORT) == 0)
return; return;
control.id = portid; control.id = vtcon_gtoh32(sc, portid);
control.event = event; control.event = vtcon_gtoh16(sc, event);
control.value = value; control.value = vtcon_gtoh16(sc, value);
vtcon_ctrl_poll(sc, &control); vtcon_ctrl_poll(sc, &control);
} }
static int static int
vtcon_port_enqueue_buf(struct vtcon_port *port, void *buf, size_t len) vtcon_port_enqueue_buf(struct vtcon_port *port, void *buf, size_t len)
{ {
struct sglist_seg segs[2]; struct sglist_seg segs[2];
▲ Show 20 Lines • Show All 504 Lines • Show Last 20 Lines