diff options
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/sys/kern/sosplice/scapy/scapy.pl | 4 | ||||
| -rw-r--r-- | regress/sys/netinet/pmtu/LICENSE | 26 | ||||
| -rw-r--r-- | regress/sys/netinet6/nd6/Makefile | 4 |
3 files changed, 17 insertions, 17 deletions
diff --git a/regress/sys/kern/sosplice/scapy/scapy.pl b/regress/sys/kern/sosplice/scapy/scapy.pl index 3af41f960c5..a4e010a9e9b 100644 --- a/regress/sys/kern/sosplice/scapy/scapy.pl +++ b/regress/sys/kern/sosplice/scapy/scapy.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $OpenBSD: scapy.pl,v 1.2 2017/11/07 22:06:17 bluhm Exp $ +# $OpenBSD: scapy.pl,v 1.3 2020/12/26 00:12:03 bluhm Exp $ # Copyright (c) 2010-2017 Alexander Bluhm <bluhm@openbsd.org> # @@ -118,7 +118,7 @@ my $c = { }; my @sudo = $ENV{SUDO} ? $ENV{SUDO} : (); -my @python = $ENV{PYTHON} ? split(' ', $ENV{PYTHON}) : ("python2.7"); +my @python = $ENV{PYTHON} ? split(' ', $ENV{PYTHON}) : ("python3"); my @cmd = (@sudo, @python, $testfile, $s->{listenport}, $c->{connectport}); system("@cmd") and die "Scapy script '@cmd' failed: $?"; diff --git a/regress/sys/netinet/pmtu/LICENSE b/regress/sys/netinet/pmtu/LICENSE index c49166fbf4c..3a4cc0f6008 100644 --- a/regress/sys/netinet/pmtu/LICENSE +++ b/regress/sys/netinet/pmtu/LICENSE @@ -1,13 +1,13 @@ -# Copyright (c) 2016 Alexander Bluhm <bluhm@openbsd.org> -# -# Permission to use, copy, modify, and distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +Copyright (c) 2016-2020 Alexander Bluhm <bluhm@openbsd.org> + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/regress/sys/netinet6/nd6/Makefile b/regress/sys/netinet6/nd6/Makefile index c625c70833f..0b07af66a57 100644 --- a/regress/sys/netinet6/nd6/Makefile +++ b/regress/sys/netinet6/nd6/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.11 2020/12/25 20:16:35 bluhm Exp $ +# $OpenBSD: Makefile,v 1.12 2020/12/26 00:12:03 bluhm Exp $ # The following ports must be installed: # # scapy powerful interactive packet manipulation in python -.if ! exists(/usr/local/bin/scapy) +.if ! exists(/usr/local/bin/scapy-3) regress: @echo Install py3-scapy package to run this regress. @echo SKIPPED |