[dev] Update httpd to include necessary macros (#839)

* update httpd

* fix comments

Co-authored-by: Henry Li <lihl@microsoft.com>

SPECS/httpd/httpd.signatures.json

@@ -1,5 +1,6 @@
 {
  "Signatures": {
-  "httpd-2.4.46.tar.bz2": "740eddf6e1c641992b22359cabc66e6325868c3c5e2e3f98faf349b61ecf41ea"
+  "httpd-2.4.46.tar.bz2": "740eddf6e1c641992b22359cabc66e6325868c3c5e2e3f98faf349b61ecf41ea",
+  "macros.httpd": "6dbf9313a5d085cb705fa5ef393372ec940008f08bf1c9350f8f49d58df75dff"
  }
 }

SPECS/httpd/httpd.spec

@@ -3,13 +3,14 @@
 Summary:        The Apache HTTP Server
 Name:           httpd
 Version:        2.4.46
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Group:          Applications/System
 URL:            https://httpd.apache.org/
 Source0:        https://archive.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2
+Source1:        macros.httpd
 Patch0:         httpd-blfs_layout-1.patch
 Patch1:         httpd-uncomment-ServerName.patch
 # CVE-1999-0236 must be mitigated by the user. See "Server Side Includes" at https://httpd.apache.org/docs/2.4/misc/security_tips.html
@@ -110,6 +111,9 @@ WantedBy=multi-user.target
 
 EOF
 
+mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d
+install -m 644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.httpd
+
 install -vdm755 %{buildroot}%{_libdir}/systemd/system-preset
 echo "disable httpd.service" > %{buildroot}%{_libdir}/systemd/system-preset/50-httpd.preset
 
@@ -164,6 +168,7 @@ fi
 %{_bindir}/dbmmanage
 %{_mandir}/man1/apxs.1*
 %{_includedir}/*
+%{_rpmconfigdir}/macros.d/macros.httpd
 
 %files docs
 %defattr(-,root,root)
@@ -203,6 +208,9 @@ fi
 %exclude %{_mandir}/man1/apxs.1*
 
 %changelog
+* Wed Apr 07 2021 Henry Li <lihl@microsoft.com> - 2.4.46-5
+- Add macros.httpd to provide necessary httpd macros
+
 * Tue Feb 09 2021 Henry Li <lihl@microsoft.com> - 2.4.46-4
 - Add Provides for httpd-mmn and httpd-filesystem from httpd
 - Fix files section for httpd-devel and httpd-tools

SPECS/httpd/macros.httpd

@@ -0,0 +1,5 @@
+%_httpd_apxs %{_bindir}/apxs
+%_httpd_modconfdir %{_sysconfdir}/httpd/conf.modules.d
+%_httpd_confdir %{_sysconfdir}/httpd/conf.d
+%_httpd_contentdir %{_sysconfdir}/httpd
+%_httpd_moddir %{_libdir}/httpd/modules