commit: ce189763b6be8651daead037f020988e456a0ae7
parent c0226113bdd93e737e5a810d4cc7943ad33ca83e
Author: Michael Forney <mforney@mforney.org>
Date: Fri, 2 Oct 2020 14:55:31 -0700
pounce: Update to 2.0
Diffstat:
4 files changed, 3 insertions(+), 59 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -263,7 +263,6 @@
[submodule "pkg/pounce/src"]
path = pkg/pounce/src
url = https://git.causal.agency/pounce
- ignore = all
[submodule "pkg/qbe/src"]
path = pkg/qbe/src
url = git://c9x.me/qbe.git
diff --git a/pkg/pounce/gen.lua b/pkg/pounce/gen.lua
@@ -8,12 +8,14 @@ pkg.deps = {'pkg/libtls-bearssl/headers'}
exe('pounce', {
'bounce.c',
+ 'cert.c',
'client.c',
'config.c',
'local.c',
'ring.c',
'server.c',
'state.c',
+ 'xdg.c',
'$builddir/pkg/libtls-bearssl/libtls.a.d',
})
file('bin/pounce', '755', '$outdir/pounce')
diff --git a/pkg/pounce/patch/0001-Switch-back-to-arc4random_buf.patch b/pkg/pounce/patch/0001-Switch-back-to-arc4random_buf.patch
@@ -1,57 +0,0 @@
-From 8482f0d8fb9196755bcbe3466ac592f94e78345a Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Fri, 14 Aug 2020 00:15:58 -0700
-Subject: [PATCH] Switch back to arc4random_buf
-
-This partially reverts commit 04ad4ecc7b4b5db1bbe10372a6820ed88e2799e8.
----
- bounce.c | 9 +++------
- configure | 2 +-
- 2 files changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/bounce.c b/bounce.c
-index 8f8d38f..21dddce 100644
---- a/bounce.c
-+++ b/bounce.c
-@@ -31,7 +31,6 @@
- #include <fcntl.h>
- #include <getopt.h>
- #include <limits.h>
--#include <openssl/rand.h>
- #include <poll.h>
- #include <pwd.h>
- #include <signal.h>
-@@ -61,14 +60,12 @@
- bool verbose;
-
- static void hashPass(void) {
-+ void arc4random_buf(void *, size_t);
-+ char *pass = getpass("Password: ");
- byte rand[12];
-- int n = RAND_bytes(rand, sizeof(rand));
-- if (n < 1) errx(EX_OSERR, "RAND_bytes failure");
--
-+ arc4random_buf(rand, sizeof(rand));
- char salt[3 + BASE64_SIZE(sizeof(rand))] = "$6$";
- base64(&salt[3], rand, sizeof(rand));
--
-- char *pass = getpass("Password: ");
- printf("%s\n", crypt(pass, salt));
- }
-
-diff --git a/configure b/configure
-index 5911471..0fe0f97 100755
---- a/configure
-+++ b/configure
-@@ -32,7 +32,7 @@ done
-
- case "$(uname)" in
- (FreeBSD)
-- ldlibs -lcrypt -lcrypto
-+ ldlibs -lcrypt
- config libtls
- defstr OPENSSL_BIN /usr/bin/openssl
- defstr CERTBOT_PATH /usr/local/etc/letsencrypt
---
-2.28.0
-
diff --git a/pkg/pounce/ver b/pkg/pounce/ver
@@ -1 +1 @@
-1.4p2 r0
+2.0 r0
