sync with OpenBSD -current

This commit is contained in:
purplerain 2024-08-19 17:15:41 +00:00
parent c78abe7784
commit eb9d621948
Signed by: purplerain
GPG Key ID: F42C07F07E2E35B7
270 changed files with 666 additions and 538 deletions

View File

@ -1,26 +0,0 @@
# $OpenBSD: Makefile,v 1.2 1996/06/23 14:20:05 deraadt Exp $
# $NetBSD: Makefile,v 1.11 1995/03/21 09:05:14 cgd Exp $
SHELL= /bin/sh
ED= ../obj/ed
all: check
@:
check: build test
@if grep -h '\*\*\*' errs.o scripts.o; then :; else \
echo "tests completed successfully."; \
fi
build: mkscripts.sh
@if [ -f errs.o ]; then :; else \
echo "building test scripts for $(ED) ..."; \
$(SHELL) mkscripts.sh $(ED); \
fi
test: build ckscripts.sh
@echo testing $(ED) ...
@$(SHELL) ckscripts.sh $(ED)
clean:
rm -f *.ed *.red *.[oz] *~

View File

@ -135,7 +135,7 @@
71 combined.
72 You are in a large low room. Crawls lead north, SE, and SW.
73 Dead end crawl.
74 You are in a secret canyon which here runs e/w. It crosses over a
74 You are in a secret canyon which here runs E/W. It crosses over a
74 very tight canyon 15 feet below. If you go down you may not be able
74 to get back up.
75 You are at a wide place in a very tight N/S canyon.
@ -182,7 +182,7 @@
99 distance. An extremely tight tunnel leads east. It looks like a very
99 tight squeeze. An eerie light can be seen at the other end.
100 You're in a small chamber lit by an eerie green light. An extremely
100 narrow tunnel exits to the west. A dark corridor leads ne.
100 narrow tunnel exits to the west. A dark corridor leads NE.
101 You're in the Dark-Room. A corridor leading south is the only exit.
102 You are in an arched hall. A coral passage once continued up and east
102 from here, but is now blocked by debris. The air smells of sea water.
@ -249,7 +249,7 @@
119 You are in a secret canyon which exits to the north and east.
120 You are in a secret canyon which exits to the north and east.
121 You are in a secret canyon which exits to the north and east.
122 You are on the far side of the chasm. A ne path leads away from the
122 You are on the far side of the chasm. A NE path leads away from the
122 chasm on this side.
123 You're in a long east/west corridor. A faint rumbling noise can be
123 heard in the distance.

View File

@ -1,2 +0,0 @@
Andries Brouwer
mcvax!aeb

View File

@ -191,7 +191,7 @@ If you can't learn to do it well, learn to enjoy doing it badly.
If you need a wand of digging, kindly ask the minotaur.
If you see nurses you better start looking somewhere for a doctor.
If you turn blind: don't expect your dog to be turned into a seeing-eye dog.
If you want to feal great, you must eat something real big.
If you want to feel great, you must eat something real big.
If you want to float you'd better eat a floating eye.
If you want to genocide nurses, genocide @'s.
If you want to hit, use a dagger.

View File

@ -1,6 +1,6 @@
A Water Leaper 12 14 16 24 59 0 0 62
A Leech 4 19 29 30 66 0 0 73
An Urisk 13 30 15 46 127 1 0 3
An Urisk 13 30 15 46 127 1 0 3
Shellycoat 28 21 18 63 226 2 0 0
A Naiad 21 62 27 58 378 2 0 11
A Nixie 22 58 28 108 604 3 0 6

View File

@ -141,7 +141,7 @@ osculum:lip
libo:sip|touch|kiss
nata:daughter
haereo:{I }[stick to|adhere]
promitto:primise
promitto:promise
sublimis:high|uplifted|up high
quando:since|when|because
arcanum:{a }secret

View File

@ -19,7 +19,7 @@ Pompeii:Vesuvius
{Yukio }Mishima:{Yukio }Mishima
{Alexander }Hamilton:{Aaron }Burr
Cleopatra:{the |an }asp
[Ann Boleyn|Catharine Howard]:Henry{ VIII}
[Ann Boleyn|Catherine Howard]:Henry{ VIII}
vaudeville:{the }movies|film
{the }movies|film:TV|television
{the }VA patients:{the }nurses

View File

@ -66,7 +66,7 @@ The curfew tolls the knell of parting day{,}:\
The lowing herd wind slowly o'er the lea:\
Elegy{ Written in a Country Church{-| }Yard:\
{Thomas }Gray
The best laid schemes o' mice an' men gang aft a-gley{,}:\
The best laid schemes o' mice an' men gang aft agley{,}:\
An{'|d} lea{'|v}e us nought but grief an{'|d} pain for promised joy{.}:\
To a Mouse:\
{Robert }Burns

View File

@ -1,5 +1,5 @@
captain's name:{James |Jim }{T. }Kirk|{james |jim }{t. }kirk
first officers name:Spock|spock|Mr. Spock|mr. spock
first officer's name:Spock|spock|Mr. Spock|mr. spock
name of ship:{the }{u.s.s. }enterprise|Enterprise
name of the "good guys":{the }Federation|federation|{the }federation
name of the "bad guys":{the }klingons|{the }romulans

View File

@ -117,7 +117,7 @@
9-305:when possession by secured party perfects security interest without filing
9-306:proceeds; secured party's rights on disposition of collateral
9-307:protection of buyers of goods
9-310:periority of certain liens arising by opration of law (mechanic's liens)
9-310:periority of certain liens arising by operation of law (mechanic's liens)
9-311:alienability of debtor's rights; judicial process
9-312:priorities among conflicting security interests in the same collateral
9-405:assignment of security interest

View File

@ -1,3 +1,3 @@
# $Id: Makefile.inc,v 1.1.1.1 1995/10/18 08:38:45 deraadt Exp $
# $OpenBSD: Makefile.inc,v 1.2 2024/08/18 20:14:49 deraadt Exp $
BINDIR?= /usr/bin

View File

@ -1,11 +1,11 @@
/* $OpenBSD: thread_private.h,v 1.36 2021/01/06 19:54:17 otto Exp $ */
/* $OpenBSD: thread_private.h,v 1.37 2024/08/18 02:25:51 guenther Exp $ */
/* PUBLIC DOMAIN: No Rights Reserved. Marco S Hyman <marc@snafu.org> */
#ifndef _THREAD_PRIVATE_H_
#define _THREAD_PRIVATE_H_
#include <stdio.h> /* for FILE and __isthreaded */
extern int __isthreaded;
#define _MALLOC_MUTEXES 32
void _malloc_init(int);
@ -77,14 +77,15 @@ PROTO_NORMAL(_malloc_init);
* Returns the address of the thread's TCB.
*/
struct __sFILE;
struct pthread;
struct thread_callbacks {
int *(*tc_errnoptr)(void); /* MUST BE FIRST */
void *(*tc_tcb)(void);
__dead void (*tc_canceled)(void);
void (*tc_flockfile)(FILE *);
int (*tc_ftrylockfile)(FILE *);
void (*tc_funlockfile)(FILE *);
void (*tc_flockfile)(struct __sFILE *);
int (*tc_ftrylockfile)(struct __sFILE *);
void (*tc_funlockfile)(struct __sFILE *);
void (*tc_malloc_lock)(int);
void (*tc_malloc_unlock)(int);
void (*tc_atexit_lock)(void);

View File

@ -1,4 +1,4 @@
/* $OpenBSD: ___runetype_mb.c,v 1.3 2017/09/05 03:16:13 schwarze Exp $ */
/* $OpenBSD: ___runetype_mb.c,v 1.4 2024/08/18 02:22:29 guenther Exp $ */
/* $NetBSD: ___runetype_mb.c,v 1.10 2005/02/10 19:19:57 tnozaki Exp $ */
/*-
@ -34,7 +34,7 @@
*/
#include <wctype.h>
#include "rune.h"
#include "runetype.h"
#include "rune_local.h"
_RuneType

View File

@ -1,4 +1,4 @@
/* $OpenBSD: _wctrans.c,v 1.2 2012/12/05 23:20:00 deraadt Exp $ */
/* $OpenBSD: _wctrans.c,v 1.3 2024/08/18 02:22:29 guenther Exp $ */
/* $NetBSD: _wctrans.c,v 1.6 2005/02/10 19:19:57 tnozaki Exp $ */
/*-
@ -62,8 +62,7 @@
#include <wctype.h>
#include <stdlib.h>
#include <string.h>
#include "rune.h"
#include "rune_local.h"
#include "runetype.h"
#include "_wctrans_local.h"
/*

View File

@ -1,4 +1,4 @@
/* $OpenBSD: rune.c,v 1.10 2022/07/27 20:00:11 guenther Exp $ */
/* $OpenBSD: rune.c,v 1.11 2024/08/18 02:22:29 guenther Exp $ */
/* $NetBSD: rune.c,v 1.26 2004/05/09 11:26:33 kleink Exp $ */
/*-
@ -63,12 +63,13 @@
#include <sys/stat.h>
#include <assert.h>
#include <errno.h>
#include <locale.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
#include "rune.h"
#include "runetype.h"
#include "rune_local.h"
#define SAFE_ADD(x, y) \

View File

@ -1,4 +1,4 @@
/* $OpenBSD: rune.h,v 1.5 2024/02/04 12:46:01 jca Exp $ */
/* $OpenBSD: rune.h,v 1.6 2024/08/18 02:22:29 guenther Exp $ */
/* $NetBSD: rune.h,v 1.9 2003/08/07 16:43:04 agc Exp $ */
/*-
@ -39,8 +39,6 @@
#define _RUNE_H_
#include <locale.h>
#include <stdio.h>
#include <wchar.h>
#include "runetype.h"
#define _LOCALE_NONE (locale_t)0

View File

@ -1,4 +1,4 @@
/* $OpenBSD: rune_local.h,v 1.8 2022/07/27 20:00:11 guenther Exp $ */
/* $OpenBSD: rune_local.h,v 1.9 2024/08/18 02:22:29 guenther Exp $ */
/* $NetBSD: rune_local.h,v 1.7 2003/03/02 22:18:15 tshiozak Exp $ */
/*-
@ -30,6 +30,9 @@
#ifndef _RUNE_LOCAL_H_
#define _RUNE_LOCAL_H_
#include <stdio.h>
#include <wchar.h>
__BEGIN_HIDDEN_DECLS
/* rune.c */

View File

@ -40,7 +40,6 @@
#include <assert.h>
#include <wchar.h>
#include "rune.h"
#include "rune_local.h"
#include "citrus_ctype.h"
_RuneLocale _DefaultRuneLocale = {

View File

@ -1,4 +1,4 @@
/* $OpenBSD: setlocale.c,v 1.30 2019/07/03 03:24:04 deraadt Exp $ */
/* $OpenBSD: setlocale.c,v 1.31 2024/08/18 02:20:29 guenther Exp $ */
/*
* Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
*
@ -16,6 +16,7 @@
*/
#include <locale.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

View File

@ -1,4 +1,4 @@
/* $OpenBSD: wctype.c,v 1.2 2024/02/04 12:46:01 jca Exp $ */
/* $OpenBSD: wctype.c,v 1.3 2024/08/18 02:22:29 guenther Exp $ */
/* $NetBSD: iswctype.c,v 1.15 2005/02/09 21:35:46 kleink Exp $ */
/*
@ -38,7 +38,6 @@
#include <wchar.h>
#include <wctype.h>
#include <string.h>
#include "rune.h"
#include "runetype.h"
static struct _WCTypeEntry wctype_entries[_WCTYPE_NINDEXES] =

View File

@ -1,4 +1,4 @@
/* $OpenBSD: rthread_cb.h,v 1.3 2021/01/06 19:54:17 otto Exp $ */
/* $OpenBSD: rthread_cb.h,v 1.4 2024/08/18 02:25:51 guenther Exp $ */
/*
* Copyright (c) 2016 Philip Guenther <guenther@openbsd.org>
* All Rights Reserved.
@ -16,12 +16,12 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <stdio.h>
struct __sFILE;
__BEGIN_HIDDEN_DECLS
void _thread_flockfile(FILE *);
int _thread_ftrylockfile(FILE *);
void _thread_funlockfile(FILE *);
void _thread_flockfile(struct __sFILE *);
int _thread_ftrylockfile(struct __sFILE *);
void _thread_funlockfile(struct __sFILE *);
void _thread_malloc_lock(int);
void _thread_malloc_unlock(int);
void _thread_atexit_lock(void);

View File

@ -1,4 +1,4 @@
/* $OpenBSD: localtime.c,v 1.66 2024/04/04 02:20:01 millert Exp $ */
/* $OpenBSD: localtime.c,v 1.67 2024/08/18 02:20:29 guenther Exp $ */
/*
** This file is in the public domain, so clarified as of
** 1996-06-05 by Arthur David Olson.
@ -13,6 +13,7 @@
#include <errno.h>
#include <fcntl.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>

View File

@ -1,4 +1,4 @@
/* $OpenBSD: conf_def.c,v 1.34 2024/04/09 13:56:30 beck Exp $ */
/* $OpenBSD: conf_def.c,v 1.35 2024/08/18 17:50:10 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -80,57 +80,6 @@ static char *scan_quote(CONF *conf, char *p);
static char *scan_dquote(CONF *conf, char *p);
#define scan_esc(conf,p) (((IS_EOF((conf),(p)[1]))?((p)+1):((p)+2)))
static CONF *def_create(CONF_METHOD *meth);
static int def_init_default(CONF *conf);
static int def_init_WIN32(CONF *conf);
static int def_destroy(CONF *conf);
static int def_destroy_data(CONF *conf);
static int def_load(CONF *conf, const char *name, long *eline);
static int def_load_bio(CONF *conf, BIO *bp, long *eline);
static int def_dump(const CONF *conf, BIO *bp);
static int def_is_number(const CONF *conf, char c);
static int def_to_int(const CONF *conf, char c);
static CONF_METHOD default_method = {
.name = "OpenSSL default",
.create = def_create,
.init = def_init_default,
.destroy = def_destroy,
.destroy_data = def_destroy_data,
.load_bio = def_load_bio,
.dump = def_dump,
.is_number = def_is_number,
.to_int = def_to_int,
.load = def_load
};
static CONF_METHOD WIN32_method = {
"WIN32",
def_create,
def_init_WIN32,
def_destroy,
def_destroy_data,
def_load_bio,
def_dump,
def_is_number,
def_to_int,
def_load
};
CONF_METHOD *
NCONF_default(void)
{
return &default_method;
}
LCRYPTO_ALIAS(NCONF_default);
CONF_METHOD *
NCONF_WIN32(void)
{
return &WIN32_method;
}
LCRYPTO_ALIAS(NCONF_WIN32);
static CONF *
def_create(CONF_METHOD *meth)
{
@ -151,7 +100,7 @@ def_init_default(CONF *conf)
if (conf == NULL)
return 0;
conf->meth = &default_method;
conf->meth = NCONF_default();
conf->meth_data = CONF_type_default;
conf->data = NULL;
@ -164,23 +113,13 @@ def_init_WIN32(CONF *conf)
if (conf == NULL)
return 0;
conf->meth = &WIN32_method;
conf->meth = NCONF_WIN32();
conf->meth_data = (void *)CONF_type_win32;
conf->data = NULL;
return 1;
}
static int
def_destroy(CONF *conf)
{
if (def_destroy_data(conf)) {
free(conf);
return 1;
}
return 0;
}
static int
def_destroy_data(CONF *conf)
{
@ -191,24 +130,13 @@ def_destroy_data(CONF *conf)
}
static int
def_load(CONF *conf, const char *name, long *line)
def_destroy(CONF *conf)
{
int ret;
BIO *in = NULL;
in = BIO_new_file(name, "rb");
if (in == NULL) {
if (ERR_GET_REASON(ERR_peek_last_error()) == BIO_R_NO_SUCH_FILE)
CONFerror(CONF_R_NO_SUCH_FILE);
else
CONFerror(ERR_R_SYS_LIB);
return 0;
if (def_destroy_data(conf)) {
free(conf);
return 1;
}
ret = def_load_bio(conf, in, line);
BIO_free(in);
return ret;
return 0;
}
static int
@ -416,6 +344,27 @@ err:
return (0);
}
static int
def_load(CONF *conf, const char *name, long *line)
{
int ret;
BIO *in = NULL;
in = BIO_new_file(name, "rb");
if (in == NULL) {
if (ERR_GET_REASON(ERR_peek_last_error()) == BIO_R_NO_SUCH_FILE)
CONFerror(CONF_R_NO_SUCH_FILE);
else
CONFerror(ERR_R_SYS_LIB);
return 0;
}
ret = def_load_bio(conf, in, line);
BIO_free(in);
return ret;
}
static void
clear_comments(CONF *conf, char *p)
{
@ -698,3 +647,43 @@ def_to_int(const CONF *conf, char c)
{
return c - '0';
}
static CONF_METHOD default_method = {
.name = "OpenSSL default",
.create = def_create,
.init = def_init_default,
.destroy = def_destroy,
.destroy_data = def_destroy_data,
.load_bio = def_load_bio,
.dump = def_dump,
.is_number = def_is_number,
.to_int = def_to_int,
.load = def_load
};
static CONF_METHOD WIN32_method = {
"WIN32",
def_create,
def_init_WIN32,
def_destroy,
def_destroy_data,
def_load_bio,
def_dump,
def_is_number,
def_to_int,
def_load
};
CONF_METHOD *
NCONF_default(void)
{
return &default_method;
}
LCRYPTO_ALIAS(NCONF_default);
CONF_METHOD *
NCONF_WIN32(void)
{
return &WIN32_method;
}
LCRYPTO_ALIAS(NCONF_WIN32);

View File

@ -1,4 +1,4 @@
.\" $OpenBSD: X509_REQ_add_extensions.3,v 1.1 2021/10/27 14:54:07 schwarze Exp $
.\" $OpenBSD: X509_REQ_add_extensions.3,v 1.2 2024/08/18 11:04:55 tb Exp $
.\"
.\" Copyright (c) 2021 Ingo Schwarze <schwarze@openbsd.org>
.\"
@ -14,15 +14,13 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.Dd $Mdocdate: October 27 2021 $
.Dd $Mdocdate: August 18 2024 $
.Dt X509_REQ_ADD_EXTENSIONS 3
.Os
.Sh NAME
.Nm X509_REQ_add_extensions ,
.Nm X509_REQ_add_extensions_nid ,
.Nm X509_REQ_get_extensions ,
.Nm X509_REQ_set_extension_nids ,
.Nm X509_REQ_get_extension_nids ,
.Nm X509_REQ_extension_nid
.Nd extensions in certification requests
.Sh SYNOPSIS
@ -40,10 +38,6 @@
.Fc
.Ft STACK_OF(X509_EXTENSION) *
.Fn X509_REQ_get_extensions "X509_REQ *req"
.Ft void
.Fn X509_REQ_set_extension_nids "int *nids"
.Ft int *
.Fn X509_REQ_get_extension_nids void
.Ft int
.Fn X509_REQ_extension_nid "int nid"
.Sh DESCRIPTION
@ -77,21 +71,6 @@ and
.Dv NID_ms_ext_req
are considered appropriate.
.Pp
.Fn X509_REQ_set_extension_nids
replaces the list of attribute types that
.Fn X509_REQ_get_extensions
considers appropriate for storing extensions.
The
.Fa nids
argument is interpreted as a pointer to the first element
of a variable-sized array of
.Vt int .
The last element of the array has to be
.Dv NID_undef .
The array needs to remain valid until
.Fn X509_REQ_set_extension_nids
is called again with a different argument.
.Pp
.Fn X509_REQ_extension_nid
checks whether
.Fn X509_REQ_get_extensions
@ -118,13 +97,6 @@ does not contain
contains no attribute of an appropriate type,
or if decoding or memory allocation fails.
.Pp
.Fn X509_REQ_get_extension_nids
returns the pointer installed with
.Fn X509_REQ_set_extension_nids
or a pointer to a static array
.Brq Dv NID_ext_req , NID_ms_ext_req , NID_undef
by default.
.Pp
.Fn X509_REQ_extension_nid
returns 1 if
.Fa nid

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.3 2020/12/17 00:51:11 bluhm Exp $
# $OpenBSD: Makefile,v 1.4 2024/08/19 01:43:23 deraadt Exp $
ED ?= /bin/ed
TESTDIR = ${.CURDIR}/../../../bin/ed/test
TESTDIR = ${.CURDIR}
TS != cd ${TESTDIR} && ls *.t
ERRS != cd ${TESTDIR} && ls *.err

View File

@ -1,4 +1,4 @@
$OpenBSD: README,v 1.3 2018/01/09 00:43:10 bluhm Exp $
$OpenBSD: README,v 1.1 2024/08/19 01:43:23 deraadt Exp $
$NetBSD: README,v 1.8 1995/03/21 09:05:18 cgd Exp $
The files in this directory with suffixes `.t', `.d', `.r' and `.err' are

View File

@ -1,4 +1,4 @@
$OpenBSD: TODO,v 1.2 1996/06/23 14:20:06 deraadt Exp $
$OpenBSD: TODO,v 1.1 2024/08/19 01:43:23 deraadt Exp $
$NetBSD: TODO,v 1.3 1995/03/21 09:05:20 cgd Exp $
Some missing tests:

View File

@ -1,5 +1,5 @@
#!/bin/sh -
# $OpenBSD: ckscripts.sh,v 1.3 1998/07/12 03:49:08 todd Exp $
# $OpenBSD: ckscripts.sh,v 1.1 2024/08/19 01:43:23 deraadt Exp $
# $NetBSD: ckscripts.sh,v 1.9 1995/04/23 10:07:34 cgd Exp $
#
# This script runs the .ed scripts generated by mkscripts.sh

Some files were not shown because too many files have changed in this diff Show More