commit: b629feda212a0fef12518cd927b30f942e8f4ff3
parent 2d407d8fcb0c8230a66668d49c2008fecfe2df2b
Author: Michael Forney <mforney@mforney.org>
Date: Sun, 28 Apr 2019 00:35:35 -0700
openbsd: Update to 6.5
Diffstat:
6 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/pkg/openbsd/fetch.sh b/pkg/openbsd/fetch.sh
@@ -28,6 +28,6 @@ zcat src.tar.gz | ${PAXREAD:-pax -r} -s ',^,src/,' \
'usr.bin/patch/*' \
'usr.bin/yacc/*' \
'usr.sbin/acme-client/*'
-zcat sys.tar.gz | ${PAXREAD:-pax -r} -s ',^,src/,' 'sys/sys/*'
+zcat sys.tar.gz | ${PAXREAD:-pax -r} -s ',^[^/]*,src,' './sys/sys/*'
git apply -v --whitespace=nowarn --directory "$dir/src" patch/*
diff --git a/pkg/openbsd/gen.lua b/pkg/openbsd/gen.lua
@@ -63,7 +63,7 @@ file('bin/doas', '6755', '$outdir/doas')
man{'usr.bin/doas/doas.1', 'usr.bin/doas/doas.conf.5'}
-- fmt
-file('bin/fmt', '755', exe('fmt', {'usr.bin/fmt/fmt.c'}))
+file('bin/fmt', '755', exe('fmt', {'usr.bin/fmt/fmt.c', 'libbsd.a'}))
man{'usr.bin/fmt/fmt.1'}
-- m4
diff --git a/pkg/openbsd/patch/0016-doas-Port-to-linux-musl.patch b/pkg/openbsd/patch/0016-doas-Port-to-linux-musl.patch
@@ -1,4 +1,4 @@
-From 6cfb637821716082e7ab7e8bec3300d1dc01e4d8 Mon Sep 17 00:00:00 2001
+From 65238908e99eaffcc1c9d61d927a0f9443c82f05 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
@@ -30,7 +30,7 @@ Call openlog at start to set syslog identity.
create mode 100644 usr.bin/doas/persist.c
diff --git a/usr.bin/doas/doas.1 b/usr.bin/doas/doas.1
-index d39c4aab2d5..3097991bc68 100644
+index d39c4aab2..3097991bc 100644
--- a/usr.bin/doas/doas.1
+++ b/usr.bin/doas/doas.1
@@ -22,7 +22,6 @@
@@ -57,7 +57,7 @@ index d39c4aab2d5..3097991bc68 100644
Parse and check the configuration file
.Ar config ,
diff --git a/usr.bin/doas/doas.c b/usr.bin/doas/doas.c
-index f20f5d35b69..1080edc5bbc 100644
+index 116ac6f16..289d4fef4 100644
--- a/usr.bin/doas/doas.c
+++ b/usr.bin/doas/doas.c
@@ -20,8 +20,6 @@
@@ -140,7 +140,7 @@ index f20f5d35b69..1080edc5bbc 100644
if (!challenge) {
char host[HOST_NAME_MAX + 1];
if (gethostname(host, sizeof(host)))
-@@ -221,20 +241,17 @@ authuser(char *myname, char *login_style, int persist)
+@@ -221,21 +241,18 @@ authuser(char *myname, char *login_style, int persist)
response = readpassphrase(challenge, rbuf, sizeof(rbuf),
RPP_REQUIRE_TTY);
if (response == NULL && errno == ENOTTY) {
@@ -150,9 +150,10 @@ index f20f5d35b69..1080edc5bbc 100644
errx(1, "a tty is required");
}
- if (!auth_userresponse(as, response, 0)) {
++ if (!verifypasswd(myname, response)) {
+ explicit_bzero(rbuf, sizeof(rbuf));
- syslog(LOG_AUTHPRIV | LOG_NOTICE,
- "failed auth for %s", myname);
-+ if (!verifypasswd(myname, response)) {
+ syslog(LOG_NOTICE, "failed auth for %s", myname);
errx(1, "Authorization failed");
}
@@ -165,7 +166,7 @@ index f20f5d35b69..1080edc5bbc 100644
close(fd);
}
}
-@@ -280,14 +297,13 @@ done:
+@@ -281,14 +298,13 @@ done:
int
main(int argc, char **argv)
{
@@ -182,7 +183,7 @@ index f20f5d35b69..1080edc5bbc 100644
struct passwd *pw;
const struct rule *rule;
uid_t uid;
-@@ -299,28 +315,20 @@ main(int argc, char **argv)
+@@ -300,28 +316,20 @@ main(int argc, char **argv)
int nflag = 0;
char cwdpath[PATH_MAX];
const char *cwd;
@@ -214,7 +215,7 @@ index f20f5d35b69..1080edc5bbc 100644
case 'u':
if (parseuid(optarg, &target) != 0)
errx(1, "unknown user");
-@@ -390,16 +398,16 @@ main(int argc, char **argv)
+@@ -391,16 +399,16 @@ main(int argc, char **argv)
cmd = argv[0];
if (!permit(uid, groups, ngroups, &rule, target, cmd,
(const char **)argv + 1)) {
@@ -235,7 +236,7 @@ index f20f5d35b69..1080edc5bbc 100644
}
if (unveil(_PATH_LOGIN_CONF, "r") == -1)
-@@ -418,10 +426,12 @@ main(int argc, char **argv)
+@@ -419,10 +427,12 @@ main(int argc, char **argv)
if (!pw)
errx(1, "no passwd entry for target");
@@ -252,7 +253,7 @@ index f20f5d35b69..1080edc5bbc 100644
if (pledge("stdio rpath exec", NULL) == -1)
err(1, "pledge");
-@@ -434,7 +444,7 @@ main(int argc, char **argv)
+@@ -435,7 +445,7 @@ main(int argc, char **argv)
if (pledge("stdio exec", NULL) == -1)
err(1, "pledge");
@@ -262,7 +263,7 @@ index f20f5d35b69..1080edc5bbc 100644
envp = prepenv(rule);
diff --git a/usr.bin/doas/doas.h b/usr.bin/doas/doas.h
-index cbeb3399419..b1a4c819954 100644
+index cbeb33994..b1a4c8199 100644
--- a/usr.bin/doas/doas.h
+++ b/usr.bin/doas/doas.h
@@ -31,6 +31,10 @@ extern int parse_errors;
@@ -277,7 +278,7 @@ index cbeb3399419..b1a4c819954 100644
#define DENY 2
diff --git a/usr.bin/doas/parse.y b/usr.bin/doas/parse.y
-index dd9466e5f13..d1f698c7679 100644
+index dd9466e5f..d1f698c76 100644
--- a/usr.bin/doas/parse.y
+++ b/usr.bin/doas/parse.y
@@ -19,6 +19,7 @@
@@ -290,7 +291,7 @@ index dd9466e5f13..d1f698c7679 100644
#include <stdio.h>
diff --git a/usr.bin/doas/persist.c b/usr.bin/doas/persist.c
new file mode 100644
-index 00000000000..41fa747458b
+index 000000000..41fa74745
--- /dev/null
+++ b/usr.bin/doas/persist.c
@@ -0,0 +1,133 @@
@@ -428,5 +429,5 @@ index 00000000000..41fa747458b
+ return 0;
+}
--
-2.19.1
+2.21.0
diff --git a/pkg/openbsd/sha256 b/pkg/openbsd/sha256
@@ -1,2 +1,2 @@
-26b63181a7cc90418a2ca5ac87e2d32fb65ad23bdca8a07502edaf431abb6aa2 src.tar.gz
-95c6eb2c7fee014a38bf376198e8fe4f9bc7702dac9c0b1ead483383cca858dc sys.tar.gz
+0284a7286f580f5fb534b5a03a08a0e371e36cc96c11a71cc15372ce3932627d src.tar.gz
+84ccabb78c4c58914c1b88a114b9e0c4fcaf357df5df1d45aed68ad76e607db4 sys.tar.gz
diff --git a/pkg/openbsd/url b/pkg/openbsd/url
@@ -1,5 +1,5 @@
remote-name
-url = "https://fastly.cdn.openbsd.org/pub/OpenBSD/6.4/src.tar.gz"
+url = "https://fastly.cdn.openbsd.org/pub/OpenBSD/6.5/src.tar.gz"
remote-name
-url = "https://fastly.cdn.openbsd.org/pub/OpenBSD/6.4/sys.tar.gz"
+url = "https://fastly.cdn.openbsd.org/pub/OpenBSD/6.5/sys.tar.gz"
diff --git a/pkg/openbsd/ver b/pkg/openbsd/ver
@@ -1 +1 @@
-6.4 r1
+6.5 r1
