OpenBSD: switch ports MASTER_SITES=>SITES for 7.4 - ports - FreeBSD and OpenBSD ports for this software

diff options

author	Kusoneko <kusoneko@kusoneko.moe>	2024-03-20 22:34:02 -0400
committer	June McEnroe <june@causal.agency>	2024-03-21 21:23:29 -0400
commit	30e471ef67898fff3d8b93168b27b9b760b2e897 (patch)
tree	802c7e8cafbc747497fd3c19906c6b6856986e9c /OpenBSD/net/bubger/pkg/DESCR
parent	OpenBSD: Add net/bubger (diff)
download	ports-master.tar.gz ports-master.zip

OpenBSD: switch ports MASTER_SITES=>SITES for 7.4 HEAD master

As of OpenBSD 7.4, ports give errors when using the following paradigm:
```
DISTFILES = file.ext:0 file2.ext:1
MASTER_SITES0 = https://asite.com/path/to/file.ext
MASTER_SITES1 = https://anothersite.com/path/to/file2.ext
```

Instead, ports now use the following:
```
DISTFILES = file.ext
DISTFILES.substring = file2.ext
SITES = https://asite.com/path/to/file.ext
SITES.substring = https://anothersite.com/path/to/file2.ext
```

This changes all the OpenBSD ports to the new paradigm, allowing them to
compile on OpenBSD 7.4+.

Note: some OpenBSD ports are not currently up to date with upstream:
- cgit-pink uses git 2.36.1 when the latest git release is 2.44.0 as of now
- litterbox is at version 1.8 instead of 1.9
- pounce* are at version 3.0 instead of 3.1
- offers catsit instead of kitd

Signed-off-by: Kusoneko <kusoneko@kusoneko.moe>

Diffstat (limited to '')

0 files changed, 0 insertions, 0 deletions

/* $OpenBSD: tls_keypair.c,v 1.8 2021/01/05 17:37:12 jsing Exp $ */ /* * Copyright (c) 2014 Joel Sing <jsing@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. */ #include <openssl/bio.h> #include <openssl/err.h> #include <openssl/pem.h> #include <tls.h> #include "tls_internal.h" struct tls_keypair * tls_keypair_new(void) { return calloc(1, sizeof(struct tls_keypair)); } static int tls_keypair_pubkey_hash(struct tls_keypair *keypair, struct tls_error *error) { X509 *cert = NULL; int rv = -1; free(keypair->pubkey_hash); keypair->pubkey_hash = NULL; if (keypair->cert_mem == NULL) { rv = 0; goto done; } if (tls_keypair_load_cert(keypair, error, &cert) == -1) goto err; if (tls_cert_pubkey_hash(cert, &keypair->pubkey_hash) == -1) goto err; rv = 0; err: X509_free(cert); done: return (rv); } void tls_keypair_clear_key(struct tls_keypair *keypair) { freezero(keypair->key_mem, keypair->key_len); keypair->key_mem = NULL; keypair->key_len = 0; } int tls_keypair_set_cert_file(struct tls_keypair *keypair, struct tls_error *error, const char *cert_file) { if (tls_config_load_file(error, "certificate", cert_file, &keypair->cert_mem, &keypair->cert_len) == -1) return -1; return tls_keypair_pubkey_hash(keypair, error); } int tls_keypair_set_cert_mem(struct tls_keypair *keypair, struct tls_error *error, const uint8_t *cert, size_t len) { if (tls_set_mem(&keypair->cert_mem, &keypair->cert_len, cert, len) == -1) return -1; return tls_keypair_pubkey_hash(keypair, error); } int tls_keypair_set_key_file(struct tls_keypair *keypair, struct tls_error *error, const char *key_file) { tls_keypair_clear_key(keypair); return tls_config_load_file(error, "key", key_file, &keypair->key_mem, &keypair->key_len); } int tls_keypair_set_key_mem(struct tls_keypair *keypair, struct tls_error *error, const uint8_t *key, size_t len) { tls_keypair_clear_key(keypair); return tls_set_mem(&keypair->key_mem, &keypair->key_len, key, len); } int tls_keypair_set_ocsp_staple_file(struct tls_keypair *keypair, struct tls_error *error, const char *ocsp_file) { return tls_config_load_file(error, "ocsp", ocsp_file, &keypair->ocsp_staple, &keypair->ocsp_staple_len); } int tls_keypair_set_ocsp_staple_mem(struct tls_keypair *keypair, struct tls_error *error, const uint8_t *staple, size_t len) { return tls_set_mem(&keypair->ocsp_staple, &keypair->ocsp_staple_len, staple, len); } void tls_keypair_free(struct tls_keypair *keypair) { if (keypair == NULL) return; tls_keypair_clear_key(keypair); free(keypair->cert_mem); free(keypair->ocsp_staple); free(keypair->pubkey_hash); free(keypair); } int tls_keypair_load_cert(struct tls_keypair *keypair, struct tls_error *error, X509 **cert) { char *errstr = "unknown"; BIO *cert_bio = NULL; unsigned long ssl_err; int rv = -1; X509_free(*cert); *cert = NULL; if (keypair->cert_mem == NULL) { tls_error_set(error, "keypair has no certificate"); goto err; } if ((cert_bio = BIO_new_mem_buf(keypair->cert_mem, keypair->cert_len)) == NULL) { tls_error_set(error, "failed to create certificate bio"); goto err; } if ((*cert = PEM_read_bio_X509(cert_bio, NULL, tls_password_cb, NULL)) == NULL) { if ((ssl_err = ERR_peek_error()) != 0) errstr = ERR_error_string(ssl_err, NULL); tls_error_set(error, "failed to load certificate: %s", errstr); goto err; } rv = 0; err: BIO_free(cert_bio); return (rv); }


context:
space:
mode: