summaryrefslogtreecommitdiff
path: root/pkg/openbsd
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/openbsd')
-rw-r--r--pkg/openbsd/patch/0009-patch-Avoid-d_namlen.patch8
-rw-r--r--pkg/openbsd/patch/0010-patch-Fix-with-musl-s-basename-dirname.patch46
-rw-r--r--pkg/openbsd/patch/0010-pax-Fix-GNU-long-name-handling-with-short-read.patch (renamed from pkg/openbsd/patch/0011-pax-Fix-GNU-long-name-handling-with-short-read.patch)0
-rw-r--r--pkg/openbsd/patch/0011-pax-Support-xz-compression-with-J-flag.patch (renamed from pkg/openbsd/patch/0012-pax-Support-xz-compression-with-J-flag.patch)0
-rw-r--r--pkg/openbsd/patch/0012-setprogname-Explicitly-discard-const-qualifier.patch (renamed from pkg/openbsd/patch/0013-setprogname-Explicitly-discard-const-qualifier.patch)0
-rw-r--r--pkg/openbsd/patch/0013-readpassphrase-Support-systems-without-VSTATUS-and-T.patch (renamed from pkg/openbsd/patch/0014-readpassphrase-Support-systems-without-VSTATUS-and-T.patch)0
-rw-r--r--pkg/openbsd/patch/0014-Remove-getpass-definition.patch (renamed from pkg/openbsd/patch/0015-Remove-getpass-definition.patch)0
-rw-r--r--pkg/openbsd/patch/0015-doas-Port-to-linux-musl.patch (renamed from pkg/openbsd/patch/0016-doas-Port-to-linux-musl.patch)48
-rw-r--r--pkg/openbsd/patch/0016-pwcache-Don-t-use-fixed-buffer-sizes.patch (renamed from pkg/openbsd/patch/0017-pwcache-Don-t-use-fixed-buffer-sizes.patch)0
-rw-r--r--pkg/openbsd/patch/0017-Add-standalone-freezero.patch (renamed from pkg/openbsd/patch/0018-Add-standalone-freezero.patch)0
-rw-r--r--pkg/openbsd/patch/0018-m4-Use-hand-written-lexer-to-avoid-cycle-in-bootstra.patch (renamed from pkg/openbsd/patch/0019-m4-Use-hand-written-lexer-to-avoid-cycle-in-bootstra.patch)0
-rw-r--r--pkg/openbsd/patch/0019-m4-Use-_Noreturn-instead-of-__dead.patch (renamed from pkg/openbsd/patch/0020-m4-Use-_Noreturn-instead-of-__dead.patch)0
-rw-r--r--pkg/openbsd/patch/0020-m4-Add-missing-includes.patch (renamed from pkg/openbsd/patch/0021-m4-Add-missing-includes.patch)0
-rw-r--r--pkg/openbsd/patch/0021-libutil-Add-missing-includes.patch (renamed from pkg/openbsd/patch/0022-libutil-Add-missing-includes.patch)0
-rw-r--r--pkg/openbsd/patch/0022-acme-client-Add-missing-includes.patch (renamed from pkg/openbsd/patch/0023-acme-client-Add-missing-includes.patch)0
-rw-r--r--pkg/openbsd/patch/0023-rsync-Add-missing-includes.patch (renamed from pkg/openbsd/patch/0024-rsync-Add-missing-includes.patch)0
-rw-r--r--pkg/openbsd/patch/0024-rsync-Use-standard-S_ISVTX-instead-of-S_ISTXT.patch (renamed from pkg/openbsd/patch/0025-rsync-Use-standard-S_ISVTX-instead-of-S_ISTXT.patch)0
-rw-r--r--pkg/openbsd/patch/0025-rsync-Avoid-pointer-arithmetic-on-void.patch (renamed from pkg/openbsd/patch/0027-rsync-Avoid-pointer-arithmetic-on-void.patch)19
-rw-r--r--pkg/openbsd/patch/0026-Include-sys-sysmacros.h-if-necessary.patch (renamed from pkg/openbsd/patch/0028-Include-sys-sysmacros.h-if-necessary.patch)0
-rw-r--r--pkg/openbsd/patch/0026-rsync-Use-1-instead-of-INFTIM-for-poll-timeout.patch25
-rw-r--r--pkg/openbsd/patch/0027-nc-Portability-fixes-from-libressl-portable.patch (renamed from pkg/openbsd/patch/0029-nc-Portability-fixes-from-libressl-portable.patch)0
-rw-r--r--pkg/openbsd/patch/0028-pax-Ignore-EOPNOTSUPP-from-fchmodat.patch (renamed from pkg/openbsd/patch/0030-pax-Ignore-EOPNOTSUPP-from-fchmodat.patch)0
-rw-r--r--pkg/openbsd/patch/0029-acme-client-Fix-build-with-old-bison-versions.patch (renamed from pkg/openbsd/patch/0031-acme-client-Fix-build-with-old-bison-versions.patch)0
-rw-r--r--pkg/openbsd/patch/0030-rsync-Add-implementation-of-MD4.patch (renamed from pkg/openbsd/patch/0032-rsync-Add-implementation-of-MD4.patch)0
-rw-r--r--pkg/openbsd/patch/0031-pax-Fix-some-incorrect-format-specifiers.patch (renamed from pkg/openbsd/patch/0033-pax-Fix-some-incorrect-format-specifiers.patch)0
-rw-r--r--pkg/openbsd/patch/0032-pax-Use-memcpy-to-set-TMAGIC-and-TVERSION-to-avoid-w.patch (renamed from pkg/openbsd/patch/0034-pax-Use-memcpy-to-set-TMAGIC-and-TVERSION-to-avoid-w.patch)0
-rw-r--r--pkg/openbsd/patch/0033-rsync-Fix-some-incorrect-format-specifiers.patch (renamed from pkg/openbsd/patch/0035-rsync-Fix-some-incorrect-format-specifiers.patch)8
-rw-r--r--pkg/openbsd/patch/0034-m4-Declare-dopaste-only-when-it-s-used.patch (renamed from pkg/openbsd/patch/0036-m4-Declare-dopaste-only-when-it-s-used.patch)0
-rw-r--r--pkg/openbsd/sha2564
-rw-r--r--pkg/openbsd/url4
-rw-r--r--pkg/openbsd/ver2
31 files changed, 48 insertions, 116 deletions
diff --git a/pkg/openbsd/patch/0009-patch-Avoid-d_namlen.patch b/pkg/openbsd/patch/0009-patch-Avoid-d_namlen.patch
index 33d744a0..2c934216 100644
--- a/pkg/openbsd/patch/0009-patch-Avoid-d_namlen.patch
+++ b/pkg/openbsd/patch/0009-patch-Avoid-d_namlen.patch
@@ -1,4 +1,4 @@
-From 91483dfca3aa6373451120db45c60198faa0766e Mon Sep 17 00:00:00 2001
+From 602381b693ff286ed17a9a04bfceaeb255992843 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sat, 4 Jun 2016 18:40:37 -0700
Subject: [PATCH] patch: Avoid d_namlen
@@ -8,10 +8,10 @@ Subject: [PATCH] patch: Avoid d_namlen
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.bin/patch/backupfile.c b/usr.bin/patch/backupfile.c
-index d9e40bcba..1d7858ae3 100644
+index ed0767762e0..fc05e48e68d 100644
--- a/usr.bin/patch/backupfile.c
+++ b/usr.bin/patch/backupfile.c
-@@ -95,7 +95,7 @@ max_backup_version(const char *file, const char *dir)
+@@ -106,7 +106,7 @@ max_backup_version(const char *file, const char *dir)
file_name_length = strlen(file);
while ((dp = readdir(dirp)) != NULL) {
@@ -21,5 +21,5 @@ index d9e40bcba..1d7858ae3 100644
this_version = version_number(file, dp->d_name, file_name_length);
--
-2.12.2
+2.31.1
diff --git a/pkg/openbsd/patch/0010-patch-Fix-with-musl-s-basename-dirname.patch b/pkg/openbsd/patch/0010-patch-Fix-with-musl-s-basename-dirname.patch
deleted file mode 100644
index 80a1db3a..00000000
--- a/pkg/openbsd/patch/0010-patch-Fix-with-musl-s-basename-dirname.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From e16acc0e80f475b2139eabe1b07b7eb0521a7918 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 4 Jun 2016 20:13:35 -0700
-Subject: [PATCH] patch: Fix with musl's basename/dirname
-
----
- usr.bin/patch/backupfile.c | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/usr.bin/patch/backupfile.c b/usr.bin/patch/backupfile.c
-index 1d7858ae3..243d00e32 100644
---- a/usr.bin/patch/backupfile.c
-+++ b/usr.bin/patch/backupfile.c
-@@ -53,21 +53,22 @@ static void invalid_arg(const char *, const char *, int);
- char *
- find_backup_file_name(const char *file)
- {
-- char *dir, *base_versions;
-+ char *path, *base_versions;
- int highest_backup;
-
- if (backup_type == simple)
- return concat(file, simple_backup_suffix);
-- base_versions = concat(basename(file), ".~");
-- if (base_versions == NULL)
-+ path = strdup(file);
-+ if (path == NULL)
- return NULL;
-- dir = dirname(file);
-- if (dir == NULL) {
-- free(base_versions);
-+ base_versions = concat(basename(path), ".~");
-+ if (base_versions == NULL) {
-+ free(path);
- return NULL;
- }
-- highest_backup = max_backup_version(base_versions, dir);
-+ highest_backup = max_backup_version(base_versions, dirname(path));
- free(base_versions);
-+ free(path);
- if (backup_type == numbered_existing && highest_backup == 0)
- return concat(file, simple_backup_suffix);
- return make_version_name(file, highest_backup + 1);
---
-2.12.2
-
diff --git a/pkg/openbsd/patch/0011-pax-Fix-GNU-long-name-handling-with-short-read.patch b/pkg/openbsd/patch/0010-pax-Fix-GNU-long-name-handling-with-short-read.patch
index b88aa2b8..b88aa2b8 100644
--- a/pkg/openbsd/patch/0011-pax-Fix-GNU-long-name-handling-with-short-read.patch
+++ b/pkg/openbsd/patch/0010-pax-Fix-GNU-long-name-handling-with-short-read.patch
diff --git a/pkg/openbsd/patch/0012-pax-Support-xz-compression-with-J-flag.patch b/pkg/openbsd/patch/0011-pax-Support-xz-compression-with-J-flag.patch
index 00f8a8b9..00f8a8b9 100644
--- a/pkg/openbsd/patch/0012-pax-Support-xz-compression-with-J-flag.patch
+++ b/pkg/openbsd/patch/0011-pax-Support-xz-compression-with-J-flag.patch
diff --git a/pkg/openbsd/patch/0013-setprogname-Explicitly-discard-const-qualifier.patch b/pkg/openbsd/patch/0012-setprogname-Explicitly-discard-const-qualifier.patch
index a645a9e4..a645a9e4 100644
--- a/pkg/openbsd/patch/0013-setprogname-Explicitly-discard-const-qualifier.patch
+++ b/pkg/openbsd/patch/0012-setprogname-Explicitly-discard-const-qualifier.patch
diff --git a/pkg/openbsd/patch/0014-readpassphrase-Support-systems-without-VSTATUS-and-T.patch b/pkg/openbsd/patch/0013-readpassphrase-Support-systems-without-VSTATUS-and-T.patch
index 78660907..78660907 100644
--- a/pkg/openbsd/patch/0014-readpassphrase-Support-systems-without-VSTATUS-and-T.patch
+++ b/pkg/openbsd/patch/0013-readpassphrase-Support-systems-without-VSTATUS-and-T.patch
diff --git a/pkg/openbsd/patch/0015-Remove-getpass-definition.patch b/pkg/openbsd/patch/0014-Remove-getpass-definition.patch
index f2adafda..f2adafda 100644
--- a/pkg/openbsd/patch/0015-Remove-getpass-definition.patch
+++ b/pkg/openbsd/patch/0014-Remove-getpass-definition.patch
diff --git a/pkg/openbsd/patch/0016-doas-Port-to-linux-musl.patch b/pkg/openbsd/patch/0015-doas-Port-to-linux-musl.patch
index 321ba7b5..4e2b0a68 100644
--- a/pkg/openbsd/patch/0016-doas-Port-to-linux-musl.patch
+++ b/pkg/openbsd/patch/0015-doas-Port-to-linux-musl.patch
@@ -1,4 +1,4 @@
-From 9e07250958968c674c1b1041d8b2887c9e1edfc3 Mon Sep 17 00:00:00 2001
+From 3eac1566f49c5edb13c41009b571b1b391f5f841 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 26 Feb 2017 16:50:55 -0800
Subject: [PATCH] doas: Port to linux/musl
@@ -27,16 +27,16 @@ Simplify handling of PATH in the environment since we don't have
login.conf with per-user default PATH.
---
usr.bin/doas/doas.1 | 9 ---
- usr.bin/doas/doas.c | 158 ++++++++++++++---------------------------
+ usr.bin/doas/doas.c | 159 ++++++++++++++---------------------------
usr.bin/doas/doas.h | 6 +-
usr.bin/doas/env.c | 17 ++---
usr.bin/doas/parse.y | 1 +
usr.bin/doas/persist.c | 133 ++++++++++++++++++++++++++++++++++
- 6 files changed, 196 insertions(+), 128 deletions(-)
+ 6 files changed, 196 insertions(+), 129 deletions(-)
create mode 100644 usr.bin/doas/persist.c
diff --git a/usr.bin/doas/doas.1 b/usr.bin/doas/doas.1
-index fc769bdb336..c7196e347a9 100644
+index 4d2e09777c8..a91705e8e3f 100644
--- a/usr.bin/doas/doas.1
+++ b/usr.bin/doas/doas.1
@@ -22,7 +22,6 @@
@@ -63,7 +63,7 @@ index fc769bdb336..c7196e347a9 100644
Parse and check the configuration file
.Ar config ,
diff --git a/usr.bin/doas/doas.c b/usr.bin/doas/doas.c
-index a723c67a3eb..8b0c2931f92 100644
+index be05be3a968..46b0ceb136b 100644
--- a/usr.bin/doas/doas.c
+++ b/usr.bin/doas/doas.c
@@ -20,8 +20,6 @@
@@ -99,7 +99,7 @@ index a723c67a3eb..8b0c2931f92 100644
" command [args]\n");
exit(1);
}
-@@ -197,23 +204,36 @@ checkconfig(const char *confpath, int argc, char **argv,
+@@ -199,23 +206,36 @@ checkconfig(const char *confpath, int argc, char **argv,
}
}
@@ -142,11 +142,11 @@ index a723c67a3eb..8b0c2931f92 100644
- if (!(as = auth_userchallenge(myname, login_style, "auth-doas",
- &challenge)))
-- errx(1, "Authorization failed");
+- errx(1, "Authentication failed");
if (!challenge) {
char host[HOST_NAME_MAX + 1];
if (gethostname(host, sizeof(host)))
-@@ -225,75 +245,31 @@ authuser(char *myname, char *login_style, int persist)
+@@ -227,75 +247,31 @@ authuser(char *myname, char *login_style, int persist)
response = readpassphrase(challenge, rbuf, sizeof(rbuf),
RPP_REQUIRE_TTY);
if (response == NULL && errno == ENOTTY) {
@@ -161,7 +161,7 @@ index a723c67a3eb..8b0c2931f92 100644
- syslog(LOG_AUTHPRIV | LOG_NOTICE,
- "failed auth for %s", myname);
+ syslog(LOG_NOTICE, "failed auth for %s", myname);
- errx(1, "Authorization failed");
+ errx(1, "Authentication failed");
}
explicit_bzero(rbuf, sizeof(rbuf));
good:
@@ -227,7 +227,7 @@ index a723c67a3eb..8b0c2931f92 100644
struct passwd mypwstore, targpwstore;
struct passwd *mypw, *targpw;
const struct rule *rule;
-@@ -306,28 +282,20 @@ main(int argc, char **argv)
+@@ -308,28 +284,20 @@ main(int argc, char **argv)
int nflag = 0;
char cwdpath[PATH_MAX];
const char *cwd;
@@ -259,21 +259,21 @@ index a723c67a3eb..8b0c2931f92 100644
case 'u':
if (parseuid(optarg, &target) != 0)
errx(1, "unknown user");
-@@ -395,47 +363,30 @@ main(int argc, char **argv)
+@@ -399,47 +367,30 @@ main(int argc, char **argv)
cmd = argv[0];
if (!permit(uid, groups, ngroups, &rule, target, cmd,
(const char **)argv + 1)) {
- syslog(LOG_AUTHPRIV | LOG_NOTICE,
-- "failed command for %s: %s", mypw->pw_name, cmdline);
+- "command not permitted for %s: %s", mypw->pw_name, cmdline);
- errc(1, EPERM, NULL);
-+ syslog(LOG_NOTICE, "failed command for %s: %s", mypw->pw_name, cmdline);
++ syslog(LOG_NOTICE, "command not permitted for %s: %s", mypw->pw_name, cmdline);
+ errno = EPERM;
+ err(1, NULL);
}
if (!(rule->options & NOPASS)) {
if (nflag)
- errx(1, "Authorization required");
+ errx(1, "Authentication required");
- authuser(mypw->pw_name, login_style, rule->options & PERSIST);
+ authuser(mypw->pw_name, rule->options & PERSIST);
@@ -317,13 +317,15 @@ index a723c67a3eb..8b0c2931f92 100644
if (pledge("stdio rpath exec", NULL) == -1)
err(1, "pledge");
-@@ -448,21 +399,16 @@ main(int argc, char **argv)
- if (pledge("stdio exec", NULL) == -1)
+@@ -453,23 +404,17 @@ main(int argc, char **argv)
err(1, "pledge");
-- syslog(LOG_AUTHPRIV | LOG_INFO, "%s ran command %s as %s from %s",
-+ syslog(LOG_INFO, "%s ran command %s as %s from %s",
- mypw->pw_name, cmdline, targpw->pw_name, cwd);
+ if (!(rule->options & NOLOG)) {
+- syslog(LOG_AUTHPRIV | LOG_INFO,
+- "%s ran command %s as %s from %s",
++ syslog(LOG_INFO, "%s ran command %s as %s from %s",
+ mypw->pw_name, cmdline, targpw->pw_name, cwd);
+ }
envp = prepenv(rule, mypw, targpw);
@@ -341,11 +343,11 @@ index a723c67a3eb..8b0c2931f92 100644
errx(1, "%s: command not found", cmd);
err(1, "%s", cmd);
diff --git a/usr.bin/doas/doas.h b/usr.bin/doas/doas.h
-index 6f50fc22869..4e4e74476c1 100644
+index 0b3585822eb..63254dabfca 100644
--- a/usr.bin/doas/doas.h
+++ b/usr.bin/doas/doas.h
@@ -29,13 +29,17 @@ extern struct rule **rules;
- extern int nrules;
+ extern size_t nrules;
extern int parse_errors;
-extern const char *formerpath;
@@ -407,7 +409,7 @@ index 2d93a4089b6..dc9be691955 100644
/* at last, we have something to insert */
if (val) {
diff --git a/usr.bin/doas/parse.y b/usr.bin/doas/parse.y
-index dd9466e5f13..d1f698c7679 100644
+index eaaf8c4b2e6..587fd2c93a8 100644
--- a/usr.bin/doas/parse.y
+++ b/usr.bin/doas/parse.y
@@ -19,6 +19,7 @@
@@ -558,5 +560,5 @@ index 00000000000..4ad1bf1efbf
+ return 0;
+}
--
-2.30.1
+2.31.1
diff --git a/pkg/openbsd/patch/0017-pwcache-Don-t-use-fixed-buffer-sizes.patch b/pkg/openbsd/patch/0016-pwcache-Don-t-use-fixed-buffer-sizes.patch
index 3b7896ba..3b7896ba 100644
--- a/pkg/openbsd/patch/0017-pwcache-Don-t-use-fixed-buffer-sizes.patch
+++ b/pkg/openbsd/patch/0016-pwcache-Don-t-use-fixed-buffer-sizes.patch
diff --git a/pkg/openbsd/patch/0018-Add-standalone-freezero.patch b/pkg/openbsd/patch/0017-Add-standalone-freezero.patch
index 249a3e4d..249a3e4d 100644
--- a/pkg/openbsd/patch/0018-Add-standalone-freezero.patch
+++ b/pkg/openbsd/patch/0017-Add-standalone-freezero.patch
diff --git a/pkg/openbsd/patch/0019-m4-Use-hand-written-lexer-to-avoid-cycle-in-bootstra.patch b/pkg/openbsd/patch/0018-m4-Use-hand-written-lexer-to-avoid-cycle-in-bootstra.patch
index f58f366f..f58f366f 100644
--- a/pkg/openbsd/patch/0019-m4-Use-hand-written-lexer-to-avoid-cycle-in-bootstra.patch
+++ b/pkg/openbsd/patch/0018-m4-Use-hand-written-lexer-to-avoid-cycle-in-bootstra.patch
diff --git a/pkg/openbsd/patch/0020-m4-Use-_Noreturn-instead-of-__dead.patch b/pkg/openbsd/patch/0019-m4-Use-_Noreturn-instead-of-__dead.patch
index c78d504e..c78d504e 100644
--- a/pkg/openbsd/patch/0020-m4-Use-_Noreturn-instead-of-__dead.patch
+++ b/pkg/openbsd/patch/0019-m4-Use-_Noreturn-instead-of-__dead.patch
diff --git a/pkg/openbsd/patch/0021-m4-Add-missing-includes.patch b/pkg/openbsd/patch/0020-m4-Add-missing-includes.patch
index d647009b..d647009b 100644
--- a/pkg/openbsd/patch/0021-m4-Add-missing-includes.patch
+++ b/pkg/openbsd/patch/0020-m4-Add-missing-includes.patch
diff --git a/pkg/openbsd/patch/0022-libutil-Add-missing-includes.patch b/pkg/openbsd/patch/0021-libutil-Add-missing-includes.patch
index c441c199..c441c199 100644
--- a/pkg/openbsd/patch/0022-libutil-Add-missing-includes.patch
+++ b/pkg/openbsd/patch/0021-libutil-Add-missing-includes.patch
diff --git a/pkg/openbsd/patch/0023-acme-client-Add-missing-includes.patch b/pkg/openbsd/patch/0022-acme-client-Add-missing-includes.patch
index 31f034c6..31f034c6 100644
--- a/pkg/openbsd/patch/0023-acme-client-Add-missing-includes.patch
+++ b/pkg/openbsd/patch/0022-acme-client-Add-missing-includes.patch
diff --git a/pkg/openbsd/patch/0024-rsync-Add-missing-includes.patch b/pkg/openbsd/patch/0023-rsync-Add-missing-includes.patch
index 2f632cb3..2f632cb3 100644
--- a/pkg/openbsd/patch/0024-rsync-Add-missing-includes.patch
+++ b/pkg/openbsd/patch/0023-rsync-Add-missing-includes.patch
diff --git a/pkg/openbsd/patch/0025-rsync-Use-standard-S_ISVTX-instead-of-S_ISTXT.patch b/pkg/openbsd/patch/0024-rsync-Use-standard-S_ISVTX-instead-of-S_ISTXT.patch
index 39bc6502..39bc6502 100644
--- a/pkg/openbsd/patch/0025-rsync-Use-standard-S_ISVTX-instead-of-S_ISTXT.patch
+++ b/pkg/openbsd/patch/0024-rsync-Use-standard-S_ISVTX-instead-of-S_ISTXT.patch
diff --git a/pkg/openbsd/patch/0027-rsync-Avoid-pointer-arithmetic-on-void.patch b/pkg/openbsd/patch/0025-rsync-Avoid-pointer-arithmetic-on-void.patch
index 885ce499..12abaa7d 100644
--- a/pkg/openbsd/patch/0027-rsync-Avoid-pointer-arithmetic-on-void.patch
+++ b/pkg/openbsd/patch/0025-rsync-Avoid-pointer-arithmetic-on-void.patch
@@ -1,4 +1,4 @@
-From bae6ab2cb50b4c5784dcd17207f145707c77f317 Mon Sep 17 00:00:00 2001
+From 56fcd604ca9bf0ae936307c3e56d232a3daef919 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sat, 15 Jun 2019 20:06:13 -0700
Subject: [PATCH] rsync: Avoid pointer arithmetic on `void *`
@@ -7,8 +7,8 @@ Subject: [PATCH] rsync: Avoid pointer arithmetic on `void *`
usr.bin/rsync/blocks.c | 8 ++++----
usr.bin/rsync/downloader.c | 2 +-
usr.bin/rsync/io.c | 12 ++++++------
- usr.bin/rsync/sender.c | 4 ++--
- 4 files changed, 13 insertions(+), 13 deletions(-)
+ usr.bin/rsync/sender.c | 5 +++--
+ 4 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/usr.bin/rsync/blocks.c b/usr.bin/rsync/blocks.c
index 4f21a41833d..242590e5bae 100644
@@ -64,7 +64,7 @@ index 9ddb8600a73..36b086f74c8 100644
/*
* Now we read from our block.
diff --git a/usr.bin/rsync/io.c b/usr.bin/rsync/io.c
-index 8d113d6d013..181458ced08 100644
+index 27beba693d4..847af4c4c1b 100644
--- a/usr.bin/rsync/io.c
+++ b/usr.bin/rsync/io.c
@@ -117,7 +117,7 @@ io_write_blocking(int fd, const void *buf, size_t sz)
@@ -122,7 +122,7 @@ index 8d113d6d013..181458ced08 100644
}
diff --git a/usr.bin/rsync/sender.c b/usr.bin/rsync/sender.c
-index 5f9850ee9d2..d6a1f55d1a9 100644
+index 00add6b4e6c..0ac8226816f 100644
--- a/usr.bin/rsync/sender.c
+++ b/usr.bin/rsync/sender.c
@@ -128,7 +128,7 @@ send_up_fsm(struct sess *sess, size_t *phase,
@@ -134,15 +134,16 @@ index 5f9850ee9d2..d6a1f55d1a9 100644
up->stat.curpos += sz;
if (up->stat.curpos == up->stat.curlen)
-@@ -569,7 +569,7 @@ rsync_sender(struct sess *sess, int fdin,
+@@ -568,7 +568,8 @@ rsync_sender(struct sess *sess, int fdin,
+ if ((pfd[1].revents & POLLOUT) && wbufsz > 0) {
assert(pfd[2].fd == -1);
assert(wbufsz - wbufpos);
- ssz = write(fdout,
-- wbuf + wbufpos, wbufsz - wbufpos);
+- ssz = write(fdout, wbuf + wbufpos, wbufsz - wbufpos);
++ ssz = write(fdout,
+ (char *)wbuf + wbufpos, wbufsz - wbufpos);
if (ssz == -1) {
ERR("write");
goto out;
--
-2.23.0
+2.31.1
diff --git a/pkg/openbsd/patch/0028-Include-sys-sysmacros.h-if-necessary.patch b/pkg/openbsd/patch/0026-Include-sys-sysmacros.h-if-necessary.patch
index 6b64a048..6b64a048 100644
--- a/pkg/openbsd/patch/0028-Include-sys-sysmacros.h-if-necessary.patch
+++ b/pkg/openbsd/patch/0026-Include-sys-sysmacros.h-if-necessary.patch
diff --git a/pkg/openbsd/patch/0026-rsync-Use-1-instead-of-INFTIM-for-poll-timeout.patch b/pkg/openbsd/patch/0026-rsync-Use-1-instead-of-INFTIM-for-poll-timeout.patch
deleted file mode 100644
index 6169131f..00000000
--- a/pkg/openbsd/patch/0026-rsync-Use-1-instead-of-INFTIM-for-poll-timeout.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 588522657724047a2e4c838e62dfff5db41bd506 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Fri, 14 Jun 2019 12:44:02 -0700
-Subject: [PATCH] rsync: Use -1 instead of INFTIM for poll timeout
-
----
- usr.bin/rsync/extern.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/usr.bin/rsync/extern.h b/usr.bin/rsync/extern.h
-index 040588003a4..64a02349adc 100644
---- a/usr.bin/rsync/extern.h
-+++ b/usr.bin/rsync/extern.h
-@@ -47,7 +47,7 @@
- * Use this for debugging deadlocks.
- * All poll events will use it and catch time-outs.
- */
--#define POLL_TIMEOUT (INFTIM)
-+#define POLL_TIMEOUT (-1)
-
- /*
- * Operating mode for a client or a server.
---
-2.22.0
-
diff --git a/pkg/openbsd/patch/0029-nc-Portability-fixes-from-libressl-portable.patch b/pkg/openbsd/patch/0027-nc-Portability-fixes-from-libressl-portable.patch
index 2c3cb23d..2c3cb23d 100644
--- a/pkg/openbsd/patch/0029-nc-Portability-fixes-from-libressl-portable.patch
+++ b/pkg/openbsd/patch/0027-nc-Portability-fixes-from-libressl-portable.patch
diff --git a/pkg/openbsd/patch/0030-pax-Ignore-EOPNOTSUPP-from-fchmodat.patch b/pkg/openbsd/patch/0028-pax-Ignore-EOPNOTSUPP-from-fchmodat.patch
index 2b0a5f22..2b0a5f22 100644
--- a/pkg/openbsd/patch/0030-pax-Ignore-EOPNOTSUPP-from-fchmodat.patch
+++ b/pkg/openbsd/patch/0028-pax-Ignore-EOPNOTSUPP-from-fchmodat.patch
diff --git a/pkg/openbsd/patch/0031-acme-client-Fix-build-with-old-bison-versions.patch b/pkg/openbsd/patch/0029-acme-client-Fix-build-with-old-bison-versions.patch
index 50639203..50639203 100644
--- a/pkg/openbsd/patch/0031-acme-client-Fix-build-with-old-bison-versions.patch
+++ b/pkg/openbsd/patch/0029-acme-client-Fix-build-with-old-bison-versions.patch
diff --git a/pkg/openbsd/patch/0032-rsync-Add-implementation-of-MD4.patch b/pkg/openbsd/patch/0030-rsync-Add-implementation-of-MD4.patch
index fc02ee8a..fc02ee8a 100644
--- a/pkg/openbsd/patch/0032-rsync-Add-implementation-of-MD4.patch
+++ b/pkg/openbsd/patch/0030-rsync-Add-implementation-of-MD4.patch
diff --git a/pkg/openbsd/patch/0033-pax-Fix-some-incorrect-format-specifiers.patch b/pkg/openbsd/patch/0031-pax-Fix-some-incorrect-format-specifiers.patch
index 05dd7d3a..05dd7d3a 100644
--- a/pkg/openbsd/patch/0033-pax-Fix-some-incorrect-format-specifiers.patch
+++ b/pkg/openbsd/patch/0031-pax-Fix-some-incorrect-format-specifiers.patch
diff --git a/pkg/openbsd/patch/0034-pax-Use-memcpy-to-set-TMAGIC-and-TVERSION-to-avoid-w.patch b/pkg/openbsd/patch/0032-pax-Use-memcpy-to-set-TMAGIC-and-TVERSION-to-avoid-w.patch
index ecf17adb..ecf17adb 100644
--- a/pkg/openbsd/patch/0034-pax-Use-memcpy-to-set-TMAGIC-and-TVERSION-to-avoid-w.patch
+++ b/pkg/openbsd/patch/0032-pax-Use-memcpy-to-set-TMAGIC-and-TVERSION-to-avoid-w.patch
diff --git a/pkg/openbsd/patch/0035-rsync-Fix-some-incorrect-format-specifiers.patch b/pkg/openbsd/patch/0033-rsync-Fix-some-incorrect-format-specifiers.patch
index 14d9a008..278aabbd 100644
--- a/pkg/openbsd/patch/0035-rsync-Fix-some-incorrect-format-specifiers.patch
+++ b/pkg/openbsd/patch/0033-rsync-Fix-some-incorrect-format-specifiers.patch
@@ -1,4 +1,4 @@
-From dbec208559b72489671f119e695a4c340a288803 Mon Sep 17 00:00:00 2001
+From 02cf1f8b022fd8c27eeb312ee3d649f4157899d6 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Thu, 4 Jun 2020 21:36:24 -0700
Subject: [PATCH] rsync: Fix some incorrect format specifiers
@@ -8,10 +8,10 @@ Subject: [PATCH] rsync: Fix some incorrect format specifiers
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.bin/rsync/uploader.c b/usr.bin/rsync/uploader.c
-index 38d5d24fcc7..bf82896d221 100644
+index db8bc626ae2..d1ebb7bcf1b 100644
--- a/usr.bin/rsync/uploader.c
+++ b/usr.bin/rsync/uploader.c
-@@ -945,7 +945,7 @@ rsync_uploader(struct upload *u, int *fileinfd,
+@@ -942,7 +942,7 @@ rsync_uploader(struct upload *u, int *fileinfd,
init_blk(&blk.blks[i], &blk, offs, i, mbuf, sess);
offs += blk.len;
LOG3(
@@ -21,5 +21,5 @@ index 38d5d24fcc7..bf82896d221 100644
i++;
} while (i < blk.blksz);
--
-2.27.0
+2.31.1
diff --git a/pkg/openbsd/patch/0036-m4-Declare-dopaste-only-when-it-s-used.patch b/pkg/openbsd/patch/0034-m4-Declare-dopaste-only-when-it-s-used.patch
index 3d3ccfd2..3d3ccfd2 100644
--- a/pkg/openbsd/patch/0036-m4-Declare-dopaste-only-when-it-s-used.patch
+++ b/pkg/openbsd/patch/0034-m4-Declare-dopaste-only-when-it-s-used.patch
diff --git a/pkg/openbsd/sha256 b/pkg/openbsd/sha256
index c2c2230a..219071ee 100644
--- a/pkg/openbsd/sha256
+++ b/pkg/openbsd/sha256
@@ -1,2 +1,2 @@
-90b76b58040f0ec9a9d08a5c979720d5d91a46f3e69fd710abd1a21b9960c226 src.tar.gz
-e2bf77273a99c8ed4030806c8546bf8dc8ece0cf31e784aed2001e8e8227a8ab sys.tar.gz
+eb06c8c1e0edf003af279ec31f7b67692dbf80aabd99dccde557be523e41761b src.tar.gz
+e1a41a8290a68ff1ffb0851606ce8edf96093b44824136b1d131d0f3a81f4993 sys.tar.gz
diff --git a/pkg/openbsd/url b/pkg/openbsd/url
index c529035a..2d2daf4a 100644
--- a/pkg/openbsd/url
+++ b/pkg/openbsd/url
@@ -1,5 +1,5 @@
remote-name
-url = "https://fastly.cdn.openbsd.org/pub/OpenBSD/6.8/src.tar.gz"
+url = "https://fastly.cdn.openbsd.org/pub/OpenBSD/6.9/src.tar.gz"
remote-name
-url = "https://fastly.cdn.openbsd.org/pub/OpenBSD/6.8/sys.tar.gz"
+url = "https://fastly.cdn.openbsd.org/pub/OpenBSD/6.9/sys.tar.gz"
diff --git a/pkg/openbsd/ver b/pkg/openbsd/ver
index c5038090..1d694169 100644
--- a/pkg/openbsd/ver
+++ b/pkg/openbsd/ver
@@ -1 +1 @@
-6.8 r2
+6.9 r0
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-12 20:28:41 +0000