svn commit: r542072 - in head: Mk/Uses www/apache24

[Jochen Neumeister]

Author: joneum
Date: Sun Jul 12 10:33:42 2020
New Revision: 542072
URL: https://svnweb.freebsd.org/changeset/ports/542072

Log:
  www/apache24: enable syslog for suexec
  
  This adds another knob to configure apache with syslog-enabled suexec
  
  PR:	239264
  Submitted by:	Robert Schulze <rs at bytecamp.net>
  Approved by:	apache (with hat)
  Sponsored by:	Netzkommune GmbH

Modified:
  head/Mk/Uses/apache.mk
  head/www/apache24/Makefile
  head/www/apache24/Makefile.options
  head/www/apache24/Makefile.options.desc

Modified: head/Mk/Uses/apache.mk
==============================================================================
--- head/Mk/Uses/apache.mk	Sun Jul 12 09:36:03 2020	(r542071)
+++ head/Mk/Uses/apache.mk	Sun Jul 12 10:33:42 2020	(r542072)
@@ -182,12 +182,16 @@ CONFIGURE_ARGS+=	--${SUEXEC_CONFARGS}-caller=${SUEXEC_
 			--${SUEXEC_CONFARGS}-userdir="${SUEXEC_USERDIR}" \
 			--${SUEXEC_CONFARGS}-docroot="${SUEXEC_DOCROOT}" \
 			--${SUEXEC_CONFARGS}-safepath="${SUEXEC_SAFEPATH}" \
-			--${SUEXEC_CONFARGS}-logfile="${SUEXEC_LOGFILE}" \
 			--${SUEXEC_CONFARGS}-bin="${PREFIX}/sbin/suexec"
 
 .	if defined(WITH_SUEXEC_UMASK)
 CONFIGURE_ARGS+=	--${SUEXEC_CONFARGS}-umask=${SUEXEC_UMASK}
 .	endif
+
+.	if !${PORT_OPTIONS:MSUEXEC_SYSLOG}
+CONFIGURE_ARGS+=	--${SUEXEC_CONFARGS}-logfile="${SUEXEC_LOGFILE}"
+.	endif
+
 .endif
 
 .if !defined(_APACHE_DISABLED_MODS)

Modified: head/www/apache24/Makefile
==============================================================================
--- head/www/apache24/Makefile	Sun Jul 12 09:36:03 2020	(r542071)
+++ head/www/apache24/Makefile	Sun Jul 12 10:33:42 2020	(r542072)
@@ -91,6 +91,7 @@ SOCACHE_DC_LIB_DEPENDS=		libdistcache.so:security/dist
 #  apu-1-config --(includes|ldflags) and apr_rules.mk
 SSL_CONFIGURE_ON=		--with-ssl=${OPENSSLBASE}
 SSL_USES=			ssl
+SUEXEC_SYSLOG_CONFIGURE_ON=	--without-suexec-logfile --with-suexec-syslog
 XML2ENC_USE=			GNOME=libxml2
 XML2ENC_USES=			gnome
 

Modified: head/www/apache24/Makefile.options
==============================================================================
--- head/www/apache24/Makefile.options	Sun Jul 12 09:36:03 2020	(r542071)
+++ head/www/apache24/Makefile.options	Sun Jul 12 10:33:42 2020	(r542072)
@@ -55,7 +55,8 @@ MOST_ENABLED_MODULES= \
 	WATCHDOG XML2ENC
 
 MOST_DISABLED_MODULES= \
-	AUTHNZ_LDAP BROTLI IDENT LDAP LUA MD SOCACHE_DC SOCACHE_REDIS SUEXEC
+	AUTHNZ_LDAP BROTLI IDENT LDAP LUA MD SOCACHE_DC SOCACHE_REDIS SUEXEC \
+	SUEXEC_SYSLOG
 
 #     enable/disable additional PROXY/SESSION modules
 META_MODULES=	PROXY SESSION

Modified: head/www/apache24/Makefile.options.desc
==============================================================================
--- head/www/apache24/Makefile.options.desc	Sun Jul 12 09:36:03 2020	(r542071)
+++ head/www/apache24/Makefile.options.desc	Sun Jul 12 10:33:42 2020	(r542072)
@@ -156,6 +156,7 @@ SSL_DESC=			SSL/TLS support (mod_ssl)
 STATUS_DESC=			Process/thread monitoring
 SUBSTITUTE_DESC=		Response content rewrite-like filtering
 SUEXEC_DESC=			Set uid and gid for spawned processes
+SUEXEC_SYSLOG_DESC=		Enable syslog for suexec
 
 UNIQUE_ID_DESC=			Per-request unique ids
 UNIXD_DESC=			(required) security for Unix-family platforms