[cpp-sp] branch main updated: CPPSP-30 - Rename new module libraries for SxS support

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=32d83b96856de9bcc21b6099e8b3ce9c673b486a

The following commit(s) were added to refs/heads/main by this push:
     new 32d83b96 CPPSP-30 - Rename new module libraries for SxS support
32d83b96 is described below

commit 32d83b96856de9bcc21b6099e8b3ce9c673b486a
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Oct 6 10:24:23 2025 -0400

    CPPSP-30 - Rename new module libraries for SxS support
    
    https://shibboleth.atlassian.net/browse/CPPSP-30
    
    Rename Apache sources and module file.
---
 Projects/vc22/Apache.vcxproj              |  4 ++--
 Projects/vc22/Apache.vcxproj.filters      |  6 +++---
 apache/Makefile.am                        | 14 +++++++-------
 apache/{mod_shib_24.cpp => mod_shib4.cpp} |  0
 apache/{mod_shib_24.rc => mod_shib4.rc}   |  6 +++---
 configs/apache24.config.in                |  4 +---
 6 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/Projects/vc22/Apache.vcxproj b/Projects/vc22/Apache.vcxproj
index 9378ca63..b1eed59d 100644
--- a/Projects/vc22/Apache.vcxproj
+++ b/Projects/vc22/Apache.vcxproj
@@ -27,10 +27,10 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\apache\mod_shib_24.cpp" />
+    <ClCompile Include="..\..\apache\mod_shib4.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\..\apache\mod_shib_24.rc" />
+    <ResourceCompile Include="..\..\apache\mod_shib4.rc" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>17.0</VCProjectVersion>
diff --git a/Projects/vc22/Apache.vcxproj.filters b/Projects/vc22/Apache.vcxproj.filters
index 4679849e..8cc0c2bc 100644
--- a/Projects/vc22/Apache.vcxproj.filters
+++ b/Projects/vc22/Apache.vcxproj.filters
@@ -15,13 +15,13 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\apache\mod_shib_24.cpp">
+    <ClCompile Include="..\..\apache\mod_shib4.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\..\apache\mod_shib_24.rc">
+    <ResourceCompile Include="..\..\apache\mod_shib4.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/apache/Makefile.am b/apache/Makefile.am
index 554d5aeb..9e761140 100644
--- a/apache/Makefile.am
+++ b/apache/Makefile.am
@@ -1,21 +1,21 @@
 AUTOMAKE_OPTIONS = foreign
 
 if BUILD_AP24
-modshib24dir = $(libdir)/@PACKAGE_NAME@
-modshib24_LTLIBRARIES = mod_shib_24.la
-mod_shib_24_la_SOURCES = mod_shib_24.cpp
-mod_shib_24_la_LDFLAGS = \
+modshib4dir = $(libdir)/@PACKAGE_NAME@
+modshib4_LTLIBRARIES = mod_shib4.la
+mod_shib4_la_SOURCES = mod_shib4.cpp
+mod_shib4_la_LDFLAGS = \
   -module -avoid-version \
   $(APXS24_LDFLAGS)
-mod_shib_24_la_CXXFLAGS = \
+mod_shib4_la_CXXFLAGS = \
   $(AM_CXXFLAGS) \
   $(APXS24_CFLAGS) $(APXS24_INCLUDE) \
   $(BOOST_CPPFLAGS) \
   $(PTHREAD_CFLAGS)
-mod_shib_24_la_LIBADD = \
+mod_shib4_la_LIBADD = \
   $(APXS24_LIBS) \
   $(top_builddir)/shibsp/libshibsp.la \
   $(PTHREAD_LIBS)
 endif
 
-EXTRA_DIST = mod_shib_24.cpp resource.h mod_shib_24.rc
+EXTRA_DIST = mod_shib4.cpp resource.h mod_shib4.rc
diff --git a/apache/mod_shib_24.cpp b/apache/mod_shib4.cpp
similarity index 100%
rename from apache/mod_shib_24.cpp
rename to apache/mod_shib4.cpp
diff --git a/apache/mod_shib_24.rc b/apache/mod_shib4.rc
similarity index 78%
rename from apache/mod_shib_24.rc
rename to apache/mod_shib4.rc
index c007046c..12ee0ac8 100644
--- a/apache/mod_shib_24.rc
+++ b/apache/mod_shib4.rc
@@ -27,9 +27,9 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
 #include "..\util\resourceCommon.rci"
-            VALUE "FileDescription", "Shibboleth Apache 2.4 Module\0"
-            VALUE "InternalName", "mod_shib_24\0"
-            VALUE "OriginalFilename", "mod_shib_24.so\0"
+            VALUE "FileDescription", "Shibboleth V4 Apache 2.4 Module\0"
+            VALUE "InternalName", "mod_shib4\0"
+            VALUE "OriginalFilename", "mod_shib4.so\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/configs/apache24.config.in b/configs/apache24.config.in
index 2354e09d..a1a07810 100644
--- a/configs/apache24.config.in
+++ b/configs/apache24.config.in
@@ -1,5 +1,3 @@
-# https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig
-
 # RPM installations on platforms with a conf.d directory will
 # result in this file being copied into that directory for you
 # and preserved across upgrades.
@@ -10,7 +8,7 @@
 #
 # Load the Shibboleth module.
 #
-LoadModule shib_module @-PKGLIBDIR-@/mod_shib_24.so
+LoadModule shib_module @-PKGLIBDIR-@/mod_shib4.so
 
 #
 # Turn this on to support "require valid-user" rules from other

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.