From nobody Sat Aug 5 18:55:58 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJBcZ3WLHz4mPq4; Sat, 5 Aug 2023 18:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJBcZ31lLz4btv; Sat, 5 Aug 2023 18:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691261758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pajXBiZbrw90bTs/VS4S7WWukwZTpLsYXMVNOYhTpoQ=; b=OJT11QqPzTckFr2+GWIOH3o7BlTWHuUmO0tfylGyv9fAjj02mwpKt6y0i/ps53Vigi5o0g jNYmeZ0Zu/UPugBExixf0maTewD1qKkn3HgP5lqoR9kJfdZPpH7v1WNNijnmCqZAgk1I2x C4wCkvXuIdgYHJMOyeTQmXep5kPxD8A4hX0xtE1w5XXh8sMw8TyR0PBTP2mqK0J6PGS545 5OUPOAa27RB+axJVTJANjMFPe8xX8sFQ5AP/lf9IQaGQ83hwuWoEGeRjRmgbu+c554aJJQ 23X2DaixVTexEFcWXUH2u/8oaqjYnNVilRejWqfZ0wJQnlsyXASPT/P9dwaPMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691261758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pajXBiZbrw90bTs/VS4S7WWukwZTpLsYXMVNOYhTpoQ=; b=jzmv+lvMRT/hePrbeQcmWRTXIFPVzGJ2oxxmh04PYxihLPG9D6vQmjQieDoIoVCM/CPt0F u0MYwFC8PMNrx872B3JWLfx5Om0oq/oN89EGm3U7JBiYJtD08UkudHnRnOvGyvX2egtXzh BC8mrZgwvrnMn4su8SXqhwQMq1m+KzCrbMrT2UXysY+vyAiKunyY7zSqh7qdzVswsww8Qn iosq6TAPT7P6V8fnp9DdAedFcTUosGWxYWGDwdKBJx2k4gm1PfsqJnSTqwClvX+Q+KN4dc f4yo85k6OIog5J7M0OEZJR1Lfcij5a6zW+8LeRC4Cir3Uv5570qKE/rCaIMo1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691261758; a=rsa-sha256; cv=none; b=PWYPNtJAi36/S10E039mM2qTeghg75dHMBPvh9Jgns6WDMSYvxVsEU6Zc38at+Hw+M+Snj xkSufJSLk630ZvxnUK+u+UbQ1taVxmQ6wEU+K/OZ3ZnFObw9XMpH6vOI30aF7mM2AxV/YM WE34zdK21ug66+CodS71+flUANUd4oAuw0OvfPO/r98HfJQjMXSN7JVQyL9plFtS5B3Hw3 jY1Rdm/5r4OcFe7dVScL8Rg5opm1SHz5toSIwRgtHZ9ubW0fZRiUgv7msvWARtS30tArwc MuZoz2CFnNkJu7zh3z8a/jgoL+svMCCBnolEHGh5vSNap/fR+0XcdB7wLCjAog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJBcZ276YzggR; Sat, 5 Aug 2023 18:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 375ItwBt075737; Sat, 5 Aug 2023 18:55:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 375Itwni075736; Sat, 5 Aug 2023 18:55:58 GMT (envelope-from git) Date: Sat, 5 Aug 2023 18:55:58 GMT Message-Id: <202308051855.375Itwni075736@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 1fa4d44dc27f - main - www/bozohttpd: Fix build with llvm16 and openssl3 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1fa4d44dc27f90f856a90a442bb41bdb3aa6cdc8 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=1fa4d44dc27f90f856a90a442bb41bdb3aa6cdc8 commit 1fa4d44dc27f90f856a90a442bb41bdb3aa6cdc8 Author: Muhammad Moinur Rahman AuthorDate: 2023-08-05 18:23:33 +0000 Commit: Muhammad Moinur Rahman 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 -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