From 16e064a085b8f2ffa0bf74268e92bf0e9e3b3f81 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Fri, 3 May 2024 08:59:53 +0100
Subject: [PATCH] apachectl(8): use BUG_REPORT_URL from /etc/os-release
 apachectl(8): fix grammar (#2278748) httpd.service.xml(8): mention
 ProtectSystem= setting

---
 apachectl.xml     |  5 +++--
 httpd.service.xml | 11 +++++++++--
 httpd.spec        | 13 +++++++++----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/apachectl.xml b/apachectl.xml
index 34da42c..fb3a86d 100644
--- a/apachectl.xml
+++ b/apachectl.xml
@@ -5,6 +5,7 @@
 ]>
 <!--
  Copyright 2020 Red Hat, Inc.
+ Copyright 2018 Frank Dana
 
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements. See the NOTICE file distributed with
@@ -70,7 +71,7 @@
 
       <para>The version of <command>apachectl</command> used on this
       system is a replacement script intended to be mostly (but not
-      completely) compatible with version provided with
+      completely) compatible with the version provided with
       <emphasis>Apache httpd</emphasis>.  This
       <command>apachectl</command> mostly acts as a wrapper around
       <command>systemctl</command> and manipulates the
@@ -173,7 +174,7 @@
 
   <refsect1 id='bugs'>
     <title>Bugs</title>
-    <para>Please report bugs by filing an issue in Bugzilla via <ulink url='https://bugzilla.redhat.com/'/>.</para>
+    <para>Please report bugs by filing an issue in @BUG_REPORT_URL@.</para>
   </refsect1>
 
     <refsect1>
diff --git a/httpd.service.xml b/httpd.service.xml
index 3ddbc9e..f8ec343 100644
--- a/httpd.service.xml
+++ b/httpd.service.xml
@@ -233,8 +233,8 @@ Wants=network-online.target</programlisting>
 
       <para>The <command>httpd.service</command> unit enables a
       variety of sandboxing options. Many of these prevent the service
-      from changing the system configuration - such as
-      <emphasis>ProtectClock</emphasis> and
+      from changing the system configuration or attributes of the
+      kernel - such as <emphasis>ProtectClock</emphasis> and
       <emphasis>ProtectKernelModules</emphasis>. See
       <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>
       and
@@ -262,6 +262,13 @@ Wants=network-online.target</programlisting>
         <emphasis>UserDir</emphasis> will not be able modify any
         content in <filename>/home</filename> by
         default.</para></listitem>
+
+        <listitem><para><emphasis>ProtectSystem</emphasis> is set to
+        <emphasis>yes</emphasis> by default; this mounts various
+        system paths like <filename>/usr</filename> and
+        <filename>/boot</filename> as read-only by
+        default.</para></listitem>
+
       </itemizedlist></para>
 
     </refsect2>
diff --git a/httpd.spec b/httpd.spec
index 22a33f4..c62cb8f 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -4,6 +4,7 @@
 %define mmn 20120211
 %define mmnisa %{mmn}%{__isa_name}%{__isa_bits}
 %define vstring %(source /etc/os-release; echo ${NAME})
+%define bugurl %(source /etc/os-release; echo ${BUG_REPORT_URL})
 %if 0%{?fedora} > 26 || 0%{?rhel} > 7
 %global mpm event
 %else
@@ -24,7 +25,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.59
-Release: 3%{?dist}
+Release: 3.1%{?dist}
 URL: https://httpd.apache.org/
 Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2.asc
@@ -291,13 +292,12 @@ s,@DOCROOT@,%{docroot},g
 s,@LOGDIR@,%{_localstatedir}/log/httpd,g
 ' < $RPM_SOURCE_DIR/httpd.conf.xml \
     > httpd.conf.xml
+sed 's|@BUG_REPORT_URL@|%{bugurl}|g' < $RPM_SOURCE_DIR/apachectl.xml > apachectl.xml
 
 xmlto man ./httpd.conf.xml
 xmlto man $RPM_SOURCE_DIR/htcacheclean.service.xml
 xmlto man $RPM_SOURCE_DIR/httpd.service.xml
-
-# apachectl.xml => apachectl.8
-xmlto man %{SOURCE47}
+xmlto man apachectl.xml
 
 : Building with MMN %{mmn}, MMN-ISA %{mmnisa}
 : Default MPM is %{mpm}, vendor string is '%{vstring}'
@@ -827,6 +827,11 @@ exit $rv
 %{_rpmconfigdir}/macros.d/macros.httpd
 
 %changelog
+* Fri May  3 2024 Joe Orton <jorton@redhat.com> - 2.4.59-3.1
+- apachectl(8): use BUG_REPORT_URL from /etc/os-release
+- apachectl(8): fix grammar (#2278748)
+- httpd.service.xml(8): mention ProtectSystem= setting
+
 * Wed May  1 2024 Joe Orton <jorton@redhat.com> - 2.4.59-3
 - add ServerTokens: Full-Release support