git: 1fa4d44dc27f - main - www/bozohttpd: Fix build with llvm16 and openssl3
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 05 Aug 2023 18:55:58 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1fa4d44dc27f90f856a90a442bb41bdb3aa6cdc8
commit 1fa4d44dc27f90f856a90a442bb41bdb3aa6cdc8
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-08-05 18:23:33 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-08-05 18:55:49 +0000
www/bozohttpd: Fix build with llvm16 and openssl3
- Pet portclippy
Approved by: portmgr (blanket)
Sponsored by: The FreeBSD Foundation
---
www/bozohttpd/Makefile | 51 ++++++++++++++++++++++++--------------------------
1 file changed, 24 insertions(+), 27 deletions(-)
diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile
index 74da4c199ac6..d35567a0bf6b 100644
--- a/www/bozohttpd/Makefile
+++ b/www/bozohttpd/Makefile
@@ -12,6 +12,12 @@ LICENSE= BSD2CLAUSE
USES= cpe uidfix tar:bzip2
CPE_VENDOR= eterna
+USE_RC_SUBR= bozohttpd
+
+MAKE_ARGS= LDADD="${LIBS}"
+
+PLIST_FILES= bin/bozohttpd \
+ man/man8/bozohttpd.8.gz
OPTIONS_DEFINE= BLACKLIST CGI DAEMON DEBUG DIRINDEX\
DYNAMIC HTPASSWD LUA SSL USER
@@ -19,54 +25,45 @@ OPTIONS_DEFAULT= BLACKLIST CGI DAEMON DEBUG DIRINDEX\
DYNAMIC HTPASSWD LUA SSL USER
BLACKLIST_DESC= Report Unauthorized and Forbidden accesses to blacklistd
+CGI_DESC= Common Gateway Interface (CGI) support (-C, -c, -E, -e)
+DAEMON_DESC= Optional daemon mode (-b)
+DEBUG_DESC= Debug support (-d)
+DIRINDEX_DESC= Automatic directory index if index.html is missing (-X)
+DYNAMIC_DESC= Dynamic content based on file suffixes (-C, -M)
+HTPASSWD_DESC= Basic authentication with .htpasswd files
+LUA_DESC= Lua scripts for dynamic content (-L)
+SSL_DESC= SSL/TLS for HTTPS requests (-Z, -z)
+USER_DESC= Optional /~user transformation (-e, -p, -u)
+
BLACKLIST_CFLAGS_OFF= -DNO_BLACKLIST_SUPPORT
BLACKLIST_LIBS= -lblacklist
-
-CGI_DESC= Common Gateway Interface (CGI) support (-C, -c, -E, -e)
CGI_CFLAGS_OFF= -DNO_CGIBIN_SUPPORT
-
-DAEMON_DESC= Optional daemon mode (-b)
DAEMON_CFLAGS_OFF= -DNO_DAEMON_MODE
-
-DEBUG_DESC= Debug support (-d)
DEBUG_CFLAGS_OFF= -DNO_DEBUG
-
-DIRINDEX_DESC= Automatic directory index if index.html is missing (-X)
DIRINDEX_CFLAGS_OFF= -DNO_DIRINDEX_SUPPORT
-
-DYNAMIC_DESC= Dynamic content based on file suffixes (-C, -M)
DYNAMIC_CFLAGS_OFF= -DNO_DYNAMIC_CONTENT
-
-HTPASSWD_DESC= Basic authentication with .htpasswd files
HTPASSWD_CFLAGS= -DDO_HTPASSWD
HTPASSWD_LIBS= -lcrypt
-
-LUA_DESC= Lua scripts for dynamic content (-L)
+LUA_USES= lua
LUA_CFLAGS= -I${LUA_INCDIR}
LUA_CFLAGS_OFF= -DNO_LUA_SUPPORT
LUA_LDFLAGS= -L${LUA_LIBDIR}
LUA_LIBS= -llua-${LUA_VER}
-LUA_USES= lua
-
-SSL_DESC= SSL/TLS for HTTPS requests (-Z, -z)
+SSL_USES= ssl
SSL_CFLAGS= -I${OPENSSLINC}
SSL_CFLAGS_OFF= -DNO_SSL_SUPPORT
SSL_LDFLAGS= -L${OPENSSLLIB}
SSL_LIBS= -lcrypto -lssl
-SSL_USES= ssl
-SSL_VARS= BROKEN_SSL="openssl30 openssl31" \
- BROKEN_SSL_REASON="Fails to build with error: 'ERR_func_error_string' is deprecated"
-
-USER_DESC= Optional /~user transformation (-e, -p, -u)
USER_CFLAGS_OFF= -DNO_USER_SUPPORT
.include <bsd.port.options.mk>
-MAKE_ARGS= LDADD="${LIBS}"
-
-USE_RC_SUBR= bozohttpd
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
+CFLAGS+= -Wno-error=unused-but-set-variable
+.endif
-PLIST_FILES= bin/bozohttpd \
- man/man8/bozohttpd.8.gz
+.if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*}
+CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L
+.endif
.include <bsd.port.mk>