summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--bounce.c2
-rw-r--r--bounce.h4
3 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 6c33ceb..de08e06 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,11 @@ PREFIX = /usr/local
 MANDIR = ${PREFIX}/man
 ETCDIR = ${PREFIX}/etc
 LIBRESSL_PREFIX = /usr/local
+LIBRESSL_BIN_PREFIX = ${LIBRESSL_PREFIX:%=%/bin}
 
 CFLAGS += -std=c11 -Wall -Wextra -Wpedantic
 CFLAGS += ${LIBRESSL_PREFIX:%=-I%/include}
+CFLAGS += ${LIBRESSL_BIN_PREFIX:%=-D'LIBRESSL_BIN_PREFIX="%/"'}
 LDFLAGS += ${LIBRESSL_PREFIX:%=-L%/lib}
 LDLIBS = -lcrypt -lcrypto -ltls
 
diff --git a/bounce.c b/bounce.c
index d4b6175..2b1413d 100644
--- a/bounce.c
+++ b/bounce.c
@@ -59,7 +59,7 @@ static void genCert(const char *path) {
 	snprintf(subj, sizeof(subj), "/CN=%.*s", (int)strcspn(name, "."), name);
 	umask(0066);
 	execlp(
-		"openssl", "openssl", "req",
+		LIBRESSL_BIN_PREFIX "openssl", "openssl", "req",
 		"-x509", "-new", "-newkey", "rsa:4096", "-sha256", "-days", "1000",
 		"-nodes", "-subj", subj, "-out", path, "-keyout", path,
 		NULL
diff --git a/bounce.h b/bounce.h
index 17cf5b6..6b9ba66 100644
--- a/bounce.h
+++ b/bounce.h
@@ -27,6 +27,10 @@
 #define CERTBOT_PATH "/usr/local/etc/letsencrypt"
 #endif
 
+#ifndef LIBRESSL_BIN_PREFIX
+#define LIBRESSL_BIN_PREFIX
+#endif
+
 #define SOURCE_URL "https://code.causal.agency/june/pounce"
 #define ORIGIN "irc.invalid"
 
TF2June McEnroe 2019-09-16Add The Just CityJune McEnroe 2019-09-12Only GET the final redirect locationJune McEnroe 2019-09-12Consume entire bodyJune McEnroe Aborting the request and leaving data around may be causing intermittent errors. Just discard the rest of the data. 2019-09-10Add title -v flagJune McEnroe 2019-09-10Use curl error bufferJune McEnroe 2019-09-10Set Accept-Encoding in titleJune McEnroe Because apparently it's fine for servers to respond with Content-Encoding you didn't ask for, and curl won't decode it if you didn't ask for it. 2019-09-08Set title User-AgentJune McEnroe Some things don't like you if you don't send one. 2019-09-07Add -x flag to titleJune McEnroe 2019-09-07Ignore SIGPIPE in relayJune McEnroe Allows restarting consumers safely. 2019-09-07Add A Memory Called EmpireJune McEnroe 2019-09-05Handle lack of Content-TypeJune McEnroe 2019-09-05Use CURLINFO_CONTENT_TYPEJune McEnroe Oops, didn't see this. 2019-09-05Decode entities in titlesJune McEnroe 2019-09-05Print title as soon as it's availableJune McEnroe 2019-09-05Use CURL_PREFIX to set flagsJune McEnroe 2019-09-05Add titleJune McEnroe 2019-09-04Add Avorter n'est pas tuerJune McEnroe 2019-08-29Unset executable on shell scriptsJune McEnroe 2019-08-29Add long-missing setopt to bin.7June McEnroe 2019-08-29Add editJune McEnroe