Index: head/net/mininet/Makefile =================================================================== --- head/net/mininet/Makefile (revision 478600) +++ head/net/mininet/Makefile (revision 478601) @@ -1,49 +1,50 @@ # $FreeBSD$ PORTNAME= mininet PORTVERSION= 2.3.0d1 +PORTREVISION= 1 CATEGORIES= net python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= akoshibe@gmail.com COMMENT= Emulator for rapid prototyping of software defined networks LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= help2man>=0:misc/help2man RUN_DEPENDS= iperf>=0:benchmarks/iperf \ openvswitch>=0:net/openvswitch \ ${PYTHON_PKGNAMEPREFIX}ryu>=0:net/ryu@${PY_FLAVOR} \ socat>=0:net/socat \ bash:shells/bash USES= python:2.7 USE_PYTHON= distutils USE_GITHUB= yes GH_ACCOUNT= akoshibe GH_TAGNAME= b88c58c do-build: @${CC} ${WRKSRC}/mnexec.c -o ${BUILD_WRKSRC}/mnexec @help2man -N -n "create a Mininet network." --no-discard-stderr \ "${PYTHON_CMD} -B ${BUILD_WRKSRC}/bin/mn" -o ${BUILD_WRKSRC}/mn.1 @help2man -N -n "execution utility for Mininet." -h "-h" -v "-v" \ --no-discard-stderr ${BUILD_WRKSRC}/mnexec -o ${BUILD_WRKSRC}/mnexec.1 @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS}) do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/mnexec ${STAGEDIR}${PREFIX}/bin .for m in mnexec mn ${INSTALL_MAN} ${BUILD_WRKSRC}/$m.1 ${STAGEDIR}${PREFIX}/man/man1 .endfor ${INSTALL} -d ${STAGEDIR}${PREFIX}/share/doc/mininet ${INSTALL_DATA} ${BUILD_WRKSRC}/README.md ${STAGEDIR}${PREFIX}/share/doc/mininet ${INSTALL} -d ${STAGEDIR}${PREFIX}/share/examples/mininet .for f in examples/README.md examples/*.py ${INSTALL_DATA} ${BUILD_WRKSRC}/$f ${STAGEDIR}${PREFIX}/share/examples/mininet @(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS}) .endfor .include Index: head/net/openvswitch/Makefile =================================================================== --- head/net/openvswitch/Makefile (revision 478600) +++ head/net/openvswitch/Makefile (revision 478601) @@ -1,41 +1,40 @@ # Created by: Edward Tomasz Napierala # $FreeBSD$ PORTNAME= openvswitch -PORTVERSION= 2.9.2 -PORTREVISION= 1 +DISTVERSION= 2.10.0 CATEGORIES= net MASTER_SITES= http://openvswitch.org/releases/ MAINTAINER= koue@chaosophia.net COMMENT= Production quality, multilayer virtual switch LICENSE= APACHE20 BROKEN_mips64= fails to compile: ofp-actions.h:486: flexible array member in otherwise empty struct BROKEN_powerpc64= fails to compile: bfd.c: internal compiler error: in extract_insn, at recog.c BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} USES= compiler:c++14-lang cpe gmake libtool perl5 pkgconfig python:2.7 shebangfix ssl SHEBANG_FILES= ovn/utilities/ovndb-servers.ocf \ utilities/bugtool/ovs-bugtool-ovs-ofctl-loop-over-bridges \ utilities/ovs-docker \ utilities/ovs-appctl-bashcomp.bash \ vtep/ovs-vtep.in USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-shared --localstatedir=/var \ +CONFIGURE_ARGS= --enable-shared --disable-static --localstatedir=/var \ --with-dbdir=/var/db/${PORTNAME} \ --with-openssl=${OPENSSLBASE} USE_RC_SUBR= ovs-vswitchd ovsdb-server LDFLAGS+= -lpthread INSTALL_TARGET=install-strip post-install: @${MKDIR} ${STAGEDIR}/var/run/openvswitch @${MKDIR} ${STAGEDIR}/var/log/openvswitch ${INSTALL_DATA} ${WRKSRC}/vswitchd/vswitch.ovsschema ${STAGEDIR}${PREFIX}/share/openvswitch/ .include Index: head/net/openvswitch/distinfo =================================================================== --- head/net/openvswitch/distinfo (revision 478600) +++ head/net/openvswitch/distinfo (revision 478601) @@ -1,3 +1,3 @@ -TIMESTAMP = 1529508992 -SHA256 (openvswitch-2.9.2.tar.gz) = 90f084dc282fdb588a2cfff351fea359492f69600f1e4a1286e24e44901de113 -SIZE (openvswitch-2.9.2.tar.gz) = 7105444 +TIMESTAMP = 1535445946 +SHA256 (openvswitch-2.10.0.tar.gz) = 64f7cdcfffc73b2e09980d04ee22731eadd6453698b92d7397c9e45c7c174050 +SIZE (openvswitch-2.10.0.tar.gz) = 7528705 Index: head/net/openvswitch/files/patch-lib_netdev-bsd.c =================================================================== --- head/net/openvswitch/files/patch-lib_netdev-bsd.c (revision 478600) +++ head/net/openvswitch/files/patch-lib_netdev-bsd.c (nonexistent) @@ -1,19 +0,0 @@ ---- lib/netdev-bsd.c.orig 2018-07-11 07:15:18 UTC -+++ lib/netdev-bsd.c -@@ -65,7 +65,6 @@ - - VLOG_DEFINE_THIS_MODULE(netdev_bsd); - -- - struct netdev_rxq_bsd { - struct netdev_rxq up; - -@@ -1511,7 +1510,7 @@ netdev_bsd_update_flags(struct netdev *netdev_, enum n - NULL, /* get_carrier_resets */ \ - NULL, /* set_miimon_interval */ \ - netdev_bsd_get_stats, \ -- \ -+ NULL, /* get_custom_stats */ \ - GET_FEATURES, \ - NULL, /* set_advertisement */ \ - NULL, /* get_pt_mode */ \ Property changes on: head/net/openvswitch/files/patch-lib_netdev-bsd.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/openvswitch/pkg-plist =================================================================== --- head/net/openvswitch/pkg-plist (revision 478600) +++ head/net/openvswitch/pkg-plist (revision 478601) @@ -1,221 +1,232 @@ bin/ovn-controller bin/ovn-controller-vtep bin/ovn-detrace bin/ovn-docker-overlay-driver bin/ovn-docker-underlay-driver bin/ovn-nbctl bin/ovn-northd bin/ovn-sbctl bin/ovn-trace bin/ovs-appctl bin/ovs-docker bin/ovs-dpctl bin/ovs-dpctl-top bin/ovs-l3ping bin/ovs-ofctl bin/ovs-parse-backtrace bin/ovs-pcap bin/ovs-pki bin/ovs-tcpdump bin/ovs-tcpundump bin/ovs-testcontroller bin/ovs-test bin/ovs-vlan-test bin/ovs-vsctl bin/ovsdb-client bin/ovsdb-tool bin/vtep-ctl etc/bash_completion.d/ovs-appctl-bashcomp.bash etc/bash_completion.d/ovs-vsctl-bashcomp.bash include/openflow/intel-ext.h include/openflow/netronome-ext.h include/openflow/nicira-ext.h include/openflow/openflow-1.0.h include/openflow/openflow-1.1.h include/openflow/openflow-1.2.h include/openflow/openflow-1.3.h include/openflow/openflow-1.4.h include/openflow/openflow-1.5.h include/openflow/openflow-1.6.h include/openflow/openflow-common.h include/openflow/openflow.h include/openvswitch/compiler.h include/openvswitch/dynamic-string.h include/openvswitch/flow.h include/openvswitch/geneve.h include/openvswitch/hmap.h include/openvswitch/json.h include/openvswitch/list.h include/openvswitch/match.h include/openvswitch/meta-flow.h +include/openvswitch/namemap.h include/openvswitch/netdev.h include/openvswitch/nsh.h include/openvswitch/ofp-actions.h +include/openvswitch/ofp-bundle.h +include/openvswitch/ofp-connection.h include/openvswitch/ofp-ed-props.h include/openvswitch/ofp-errors.h +include/openvswitch/ofp-flow.h +include/openvswitch/ofp-group.h +include/openvswitch/ofp-ipfix.h +include/openvswitch/ofp-match.h +include/openvswitch/ofp-meter.h +include/openvswitch/ofp-monitor.h include/openvswitch/ofp-msgs.h +include/openvswitch/ofp-packet.h include/openvswitch/ofp-parse.h +include/openvswitch/ofp-port.h include/openvswitch/ofp-print.h +include/openvswitch/ofp-protocol.h include/openvswitch/ofp-prop.h +include/openvswitch/ofp-queue.h +include/openvswitch/ofp-switch.h +include/openvswitch/ofp-table.h include/openvswitch/ofp-util.h include/openvswitch/ofpbuf.h include/openvswitch/packets.h include/openvswitch/poll-loop.h include/openvswitch/rconn.h include/openvswitch/shash.h include/openvswitch/thread.h include/openvswitch/token-bucket.h include/openvswitch/tun-metadata.h include/openvswitch/type-props.h include/openvswitch/types.h include/openvswitch/util.h include/openvswitch/uuid.h include/openvswitch/vconn.h include/openvswitch/version.h include/openvswitch/vlog.h include/ovn/actions.h include/ovn/expr.h include/ovn/lex.h -lib/libofproto-2.9.so.0 -lib/libofproto-2.9.so.0.0.2 -lib/libofproto.a +lib/libofproto-2.10.so.0 +lib/libofproto-2.10.so.0.0.0 lib/libofproto.so -lib/libopenvswitch-2.9.so.0 -lib/libopenvswitch-2.9.so.0.0.2 -lib/libopenvswitch.a +lib/libopenvswitch-2.10.so.0 +lib/libopenvswitch-2.10.so.0.0.0 lib/libopenvswitch.so -lib/libovn-2.9.so.0 -lib/libovn-2.9.so.0.0.2 -lib/libovn.a +lib/libovn-2.10.so.0 +lib/libovn-2.10.so.0.0.0 lib/libovn.so -lib/libovsdb-2.9.so.0 -lib/libovsdb-2.9.so.0.0.2 -lib/libovsdb.a +lib/libovsdb-2.10.so.0 +lib/libovsdb-2.10.so.0.0.0 lib/libovsdb.so -lib/libsflow-2.9.so.0 -lib/libsflow-2.9.so.0.0.2 -lib/libsflow.a +lib/libsflow-2.10.so.0 +lib/libsflow-2.10.so.0.0.0 lib/libsflow.so -lib/libvtep-2.9.so.0 -lib/libvtep-2.9.so.0.0.2 -lib/libvtep.a +lib/libvtep-2.10.so.0 +lib/libvtep-2.10.so.0.0.0 lib/libvtep.so libdata/pkgconfig/libofproto.pc libdata/pkgconfig/libopenvswitch.pc libdata/pkgconfig/libovsdb.pc libdata/pkgconfig/libsflow.pc man/man1/ovn-detrace.1.gz man/man1/ovs-pcap.1.gz man/man1/ovs-tcpundump.1.gz man/man1/ovsdb-client.1.gz man/man1/ovsdb-server.1.gz man/man1/ovsdb-tool.1.gz man/man5/ovn-nb.5.gz man/man5/ovn-sb.5.gz man/man5/ovs-vswitchd.conf.db.5.gz man/man5/ovsdb-server.5.gz man/man5/vtep.5.gz man/man7/ovn-architecture.7.gz man/man7/ovs-fields.7.gz man/man8/ovs-appctl.8.gz man/man8/ovs-bugtool.8.gz man/man8/ovn-controller-vtep.8.gz man/man8/ovn-controller.8.gz man/man8/ovn-ctl.8.gz man/man8/ovn-nbctl.8.gz man/man8/ovn-northd.8.gz man/man8/ovn-sbctl.8.gz man/man8/ovn-trace.8.gz man/man8/ovs-ctl.8.gz man/man8/ovs-dpctl-top.8.gz man/man8/ovs-dpctl.8.gz +man/man8/ovs-kmod-ctl.8.gz man/man8/ovs-l3ping.8.gz man/man8/ovs-ofctl.8.gz man/man8/ovs-parse-backtrace.8.gz man/man8/ovs-pki.8.gz man/man8/ovs-tcpdump.8.gz man/man8/ovs-testcontroller.8.gz man/man8/ovs-vlan-bug-workaround.8.gz man/man8/ovs-vsctl.8.gz man/man8/ovs-vswitchd.8.gz man/man8/vtep-ctl.8.gz sbin/ovs-bugtool sbin/ovs-vswitchd sbin/ovsdb-server %%DATADIR%%/bugtool-plugins/kernel-info/openvswitch.xml %%DATADIR%%/bugtool-plugins/network-status/openvswitch.xml %%DATADIR%%/bugtool-plugins/network-status/ovn.xml %%DATADIR%%/bugtool-plugins/system-configuration.xml %%DATADIR%%/bugtool-plugins/system-configuration/openvswitch.xml %%DATADIR%%/bugtool-plugins/system-logs/openvswitch.xml %%DATADIR%%/ovn-nb.ovsschema %%DATADIR%%/ovn-sb.ovsschema %%DATADIR%%/python/ovs/__init__.py %%DATADIR%%/python/ovs/compat/__init__.py %%DATADIR%%/python/ovs/compat/sortedcontainers/__init__.py %%DATADIR%%/python/ovs/compat/sortedcontainers/sorteddict.py %%DATADIR%%/python/ovs/compat/sortedcontainers/sortedlist.py %%DATADIR%%/python/ovs/compat/sortedcontainers/sortedset.py %%DATADIR%%/python/ovs/daemon.py %%DATADIR%%/python/ovs/db/__init__.py %%DATADIR%%/python/ovs/db/custom_index.py %%DATADIR%%/python/ovs/db/data.py %%DATADIR%%/python/ovs/db/error.py %%DATADIR%%/python/ovs/db/idl.py %%DATADIR%%/python/ovs/db/parser.py %%DATADIR%%/python/ovs/db/schema.py %%DATADIR%%/python/ovs/db/types.py %%DATADIR%%/python/ovs/dirs.py %%DATADIR%%/python/ovs/fatal_signal.py %%DATADIR%%/python/ovs/fcntl_win.py %%DATADIR%%/python/ovs/json.py %%DATADIR%%/python/ovs/jsonrpc.py %%DATADIR%%/python/ovs/ovsuuid.py %%DATADIR%%/python/ovs/poller.py %%DATADIR%%/python/ovs/process.py %%DATADIR%%/python/ovs/reconnect.py %%DATADIR%%/python/ovs/socket_util.py %%DATADIR%%/python/ovs/stream.py %%DATADIR%%/python/ovs/timeval.py %%DATADIR%%/python/ovs/unixctl/__init__.py %%DATADIR%%/python/ovs/unixctl/client.py %%DATADIR%%/python/ovs/unixctl/server.py %%DATADIR%%/python/ovs/util.py %%DATADIR%%/python/ovs/version.py %%DATADIR%%/python/ovs/vlog.py %%DATADIR%%/python/ovs/winutils.py %%DATADIR%%/python/ovstest/__init__.py %%DATADIR%%/python/ovstest/args.py %%DATADIR%%/python/ovstest/rpcserver.py %%DATADIR%%/python/ovstest/tcp.py %%DATADIR%%/python/ovstest/tests.py %%DATADIR%%/python/ovstest/udp.py %%DATADIR%%/python/ovstest/util.py %%DATADIR%%/python/ovstest/vswitch.py %%DATADIR%%/scripts/ovs-bugtool-daemons-ver %%DATADIR%%/scripts/ovs-bugtool-fdb-show %%DATADIR%%/scripts/ovs-bugtool-get-dpdk-nic-numa %%DATADIR%%/scripts/ovs-bugtool-qos-configs %%DATADIR%%/scripts/ovn-bugtool-nbctl-show %%DATADIR%%/scripts/ovs-bugtool-ovs-appctl-dpif %%DATADIR%%/scripts/ovs-bugtool-ovs-bridge-datapath-type %%DATADIR%%/scripts/ovs-bugtool-ovs-ofctl-loop-over-bridges %%DATADIR%%/scripts/ovs-bugtool-ovs-vswitchd-threads-affinity %%DATADIR%%/scripts/ovn-bugtool-sbctl-lflow-list %%DATADIR%%/scripts/ovn-bugtool-sbctl-show %%DATADIR%%/scripts/ovs-bugtool-tc-class-show %%DATADIR%%/scripts/ovn-ctl %%DATADIR%%/scripts/ovndb-servers.ocf %%DATADIR%%/scripts/ovs-check-dead-ifs %%DATADIR%%/scripts/ovs-ctl +%%DATADIR%%/scripts/ovs-kmod-ctl %%DATADIR%%/scripts/ovs-lib %%DATADIR%%/scripts/ovs-save %%DATADIR%%/scripts/ovs-vtep %%DATADIR%%/vswitch.ovsschema %%DATADIR%%/vtep.ovsschema @dir /var/lib/openvswitch/pki @dir /var/lib/openvswitch @dir /var/lib @dir /var/log/openvswitch @dir /var/run/openvswitch @dir %%ETCDIR%%