Namespace httpd include files into its own directory

[AZaugg]

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

• [X] The toolchain has been rebuilt successfully (or no changes were made to it)
• [X] The toolchain/worker package manifests are up-to-date
• [X] Any updated packages successfully build (or no packages were changed)
• [X] Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
• [X] Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
• [X] All package sources are available
• [X] cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
• [X] LICENSE-MAP files are up-to-date (./SPECS/LICENSES-AND-NOTICES/data/licenses.json, ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md, ./SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON)
• [X] All source files have up-to-date hashes in the *.signatures.json files
• [X] sudo make go-tidy-all and sudo make go-test-coverage pass
• [X] Documentation has been updated to match any changes to the build system
• [X] Ready to merge

---

Summary

Some small house cleaning, namespace httpd-devel header files into a httpd directory

Change Log

• Namespace and put httpd header files into /usr/include/httpd

Does this affect the toolchain?

NO

Test Methodology

• Build package

azaugg@azaugg-ld77 [ ~/CBL-Mariner/toolkit ]$ sudo make build-packages -j$(nproc) REBUILD_TOOLS=y SRPM_PACK_LIST="httpd" PACKAGE_REBUILD_LIST="httpd" REFRESH_WORKER_CHROOT=y RUN_CHECK=y
...
...
...
INFO[0000][scheduler] Building 68 nodes with 8 workers
INFO[0000][scheduler] Building: httpd-2.4.56-4.cm2.src.rpm
INFO[0065][scheduler] Built: httpd-2.4.56-4.cm2.src.rpm -> [/home/azaugg/CBL-Mariner/out/RPMS/x86_64/httpd-2.4.56-4.cm2.x86_64.rpm /home/azaugg/CBL-Mariner/out/RPMS/x86_64/httpd-debuginfo-2.4.56-4.cm2.x86_64.rpm /home/azaugg/CBL-Mariner/out/RPMS/x86_64/httpd-devel-2.4.56-4.cm2.x86_64.rpm /home/azaugg/CBL-Mariner/out/RPMS/x86_64/httpd-docs-2.4.56-4.cm2.x86_64.rpm /home/azaugg/CBL-Mariner/out/RPMS/x86_64/httpd-tools-2.4.56-4.cm2.x86_64.rpm /home/azaugg/CBL-Mariner/out/RPMS/x86_64/mod_ldap-2.4.56-4.cm2.x86_64.rpm /home/azaugg/CBL-Mariner/out/RPMS/x86_64/mod_proxy_html-2.4.56-4.cm2.x86_64.rpm /home/azaugg/CBL-Mariner/out/RPMS/x86_64/mod_session-2.4.56-4.cm2.x86_64.rpm /home/azaugg/CBL-Mariner/out/RPMS/x86_64/mod_ssl-2.4.56-4.cm2.x86_64.rpm]
INFO[0065][scheduler] 0 currently active build(s): [].
WARN[0065][scheduler] Enabling cached packages to satisfy unresolved dynamic dependencies.
INFO[0065][scheduler] All packages built
INFO[0066][scheduler] ---------------------------
INFO[0066][scheduler] --------- Summary ---------
INFO[0066][scheduler] ---------------------------
INFO[0066][scheduler] Number of built SRPMs:             1
INFO[0066][scheduler] Number of tested SRPMs:            0
INFO[0066][scheduler] Number of prebuilt SRPMs:          0
INFO[0066][scheduler] Number of prebuilt delta SRPMs:    0
INFO[0066][scheduler] Number of skipped SRPMs tests:     0
INFO[0066][scheduler] Number of failed SRPMs:            0
INFO[0066][scheduler] Number of failed SRPMs tests:      0
INFO[0066][scheduler] Number of blocked SRPMs:           0
INFO[0066][scheduler] Number of blocked SRPMs tests:     0
INFO[0066][scheduler] Number of unresolved dependencies: 0
INFO[0066][scheduler] Built SRPMs:

• Confirmed header files have been namespaced

azaugg@azaugg-ld77 [ ~/CBL-Mariner/toolkit ]$ rpm -ql /home/azaugg/CBL-Mariner/out/RPMS/x86_64/httpd-devel-2.4.56-3.cm2.x86_64.rpm|grep include
/usr/include/httpd/ap_compat.h
/usr/include/httpd/ap_config.h
/usr/include/httpd/ap_config_auto.h
/usr/include/httpd/ap_config_layout.h
/usr/include/httpd/ap_expr.h
/usr/include/httpd/ap_hooks.h
/usr/include/httpd/ap_listen.h
/usr/include/httpd/ap_mmn.h
/usr/include/httpd/ap_mpm.h
/usr/include/httpd/ap_provider.h
/usr/include/httpd/ap_regex.h

[neha170]

While this is a good change, we cannot take this change into our stable release since customers may have taken a dependency on the current header file locations for one reason or another.

Instead this change should go to our upcoming Mariner 3.0 development branch

Do we see value in creating symlinks if we want this in 2.0?

[christopherco]

While this is a good change, we cannot take this change into our stable release since customers may have taken a dependency on the current header file locations for one reason or another. Instead this change should go to our upcoming Mariner 3.0 development branch

Do we see value in creating symlinks if we want this in 2.0?

I am of the opinion that we keep the changes minimal in the 2.0 stable release, and make this header location change during the main development phase of 3.0.

@azaugg please retarget this PR to 3.0-dev 😄

[AZaugg]

@christopherco done!