From 2197f4ee3304e686c70d5bba8989c57d6bd6776d Mon Sep 17 00:00:00 2001
From: Packit <packit>
Date: Sep 29 2020 09:01:34 +0000
Subject: Apply patch mod_fcgid-2.3.9-r1848311.patch


patch_name: mod_fcgid-2.3.9-r1848311.patch
present_in_specfile: true

---

diff --git a/modules/fcgid/Makefile.apxs b/modules/fcgid/Makefile.apxs
index 500449b..771adda 100644
--- a/modules/fcgid/Makefile.apxs
+++ b/modules/fcgid/Makefile.apxs
@@ -16,6 +16,7 @@ fcgid_srcdir=../..
 builddir=.
 srcdir=.
 
+MOD_FCGID_LDADD = -export-symbols-regex fcgid_module
 CLEAN_TARGETS = *.loT
 include $(exp_installbuilddir)/special.mk
 
diff --git a/modules/fcgid/Makefile.apxs.r1848311 b/modules/fcgid/Makefile.apxs.r1848311
new file mode 100644
index 0000000..500449b
--- /dev/null
+++ b/modules/fcgid/Makefile.apxs.r1848311
@@ -0,0 +1,28 @@
+##
+##  Makefile.apxs -- Build procedure for mod_fcgid Apache module
+##
+##  Do not use this target; build from the mod_fcgid dir root
+##
+ 
+# top_builddir and top_srcdir are misnomers, because build/*.mk
+# scripts expect it them be the parent of the build directory,
+# and fail to trust the installbuilddir.
+exp_installbuilddir=$(shell $(APXS) -q exp_installbuilddir)
+top_srcdir=$(installbuilddir)/..
+top_builddir=$(installbuilddir)/..
+
+fcgid_builddir=../..
+fcgid_srcdir=../..
+builddir=.
+srcdir=.
+
+CLEAN_TARGETS = *.loT
+include $(exp_installbuilddir)/special.mk
+
+all: local-shared-build all-recursive
+
+#   additional defines, includes and libraries
+DEFS=-DFCGID_APXS_BUILD
+INCLUDES=-I$(builddir) -I$(srcdir) -I$(fcgid_srcdir)/include
+#LIBS=-Lmy/lib/dir -lmylib
+
diff --git a/modules/fcgid/config.m4 b/modules/fcgid/config.m4
index eb8f67f..cc488b4 100644
--- a/modules/fcgid/config.m4
+++ b/modules/fcgid/config.m4
@@ -43,6 +43,11 @@ APACHE_MODULE(fcgid, [FastCGI support (mod_fcgid)], $fcigd_objs, , no, [
     AC_CHECK_HEADERS(sys/mman.h)
     AC_CHECK_HEADERS(sys/mutex.h)
     AC_CHECK_HEADERS(sys/shm.h)
+    if test "x$enable_fcgid" = "xshared"; then
+       # The only symbol which needs to be exported is the module
+       # structure, so ask libtool to hide everything else:
+       APR_ADDTO(MOD_FCGID_LDADD, [-export-symbols-regex fcgid_module])
+    fi
 ])
 
 dnl #  end of module specific part
diff --git a/modules/fcgid/config.m4.r1848311 b/modules/fcgid/config.m4.r1848311
new file mode 100644
index 0000000..eb8f67f
--- /dev/null
+++ b/modules/fcgid/config.m4.r1848311
@@ -0,0 +1,49 @@
+dnl Licensed to the Apache Software Foundation (ASF) under one or more
+dnl contributor license agreements.  See the NOTICE file distributed with
+dnl this work for additional information regarding copyright ownership.
+dnl The ASF licenses this file to You under the Apache License, Version 2.0
+dnl (the "License"); you may not use this file except in compliance with
+dnl the License.  You may obtain a copy of the License at
+dnl
+dnl       http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
+
+dnl #  start of module specific part
+APACHE_MODPATH_INIT(fcgid)
+
+case $host in
+    *mingw*)
+        fcgid_platform_objs="fcgid_pm_win.lo fcgid_proc_win.lo fcgid_proctbl_win.lo"
+        ;;
+    *)
+        fcgid_platform_objs="fcgid_pm_unix.lo fcgid_proc_unix.lo fcgid_proctbl_unix.lo fcgid_mutex_unix.lo"
+        ;;
+esac
+
+dnl #  list of module object files
+fcigd_objs="dnl
+mod_fcgid.lo dnl
+fcgid_bridge.lo dnl
+fcgid_conf.lo dnl
+fcgid_pm_main.lo dnl
+fcgid_protocol.lo dnl
+fcgid_spawn_ctl.lo dnl
+fcgid_bucket.lo dnl
+fcgid_filter.lo dnl
+$fcgid_platform_objs dnl
+"
+
+APACHE_MODULE(fcgid, [FastCGI support (mod_fcgid)], $fcigd_objs, , no, [
+    AC_CHECK_HEADERS(sys/file.h)
+    AC_CHECK_HEADERS(sys/mman.h)
+    AC_CHECK_HEADERS(sys/mutex.h)
+    AC_CHECK_HEADERS(sys/shm.h)
+])
+
+dnl #  end of module specific part
+APACHE_MODPATH_FINISH
diff --git a/modules/fcgid/modules.mk.apxs b/modules/fcgid/modules.mk.apxs
index 51ad05d..b6c032b 100644
--- a/modules/fcgid/modules.mk.apxs
+++ b/modules/fcgid/modules.mk.apxs
@@ -17,7 +17,7 @@
 # this is used/needed by the APACHE2 build system
 #
 mod_fcgid.la: mod_fcgid.slo fcgid_bridge.slo fcgid_conf.slo fcgid_pm_main.slo fcgid_protocol.slo fcgid_spawn_ctl.slo  fcgid_proctbl_unix.slo fcgid_pm_unix.slo fcgid_proc_unix.slo fcgid_bucket.slo fcgid_filter.slo fcgid_mutex_unix.slo
-	$(SH_LINK) -rpath $(libexecdir) -module -avoid-version mod_fcgid.lo fcgid_bridge.lo fcgid_conf.lo fcgid_pm_main.lo fcgid_protocol.lo fcgid_spawn_ctl.lo  fcgid_proctbl_unix.lo fcgid_pm_unix.lo fcgid_proc_unix.lo fcgid_bucket.lo fcgid_filter.lo fcgid_mutex_unix.lo
+	$(SH_LINK) -rpath $(libexecdir) -module -avoid-version mod_fcgid.lo fcgid_bridge.lo fcgid_conf.lo fcgid_pm_main.lo fcgid_protocol.lo fcgid_spawn_ctl.lo  fcgid_proctbl_unix.lo fcgid_pm_unix.lo fcgid_proc_unix.lo fcgid_bucket.lo fcgid_filter.lo fcgid_mutex_unix.lo $(MOD_FCGID_LDADD)
 DISTCLEAN_TARGETS = modules.mk
 static =
 shared =  mod_fcgid.la
diff --git a/modules/fcgid/modules.mk.apxs.r1848311 b/modules/fcgid/modules.mk.apxs.r1848311
new file mode 100644
index 0000000..51ad05d
--- /dev/null
+++ b/modules/fcgid/modules.mk.apxs.r1848311
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# this is used/needed by the APACHE2 build system
+#
+mod_fcgid.la: mod_fcgid.slo fcgid_bridge.slo fcgid_conf.slo fcgid_pm_main.slo fcgid_protocol.slo fcgid_spawn_ctl.slo  fcgid_proctbl_unix.slo fcgid_pm_unix.slo fcgid_proc_unix.slo fcgid_bucket.slo fcgid_filter.slo fcgid_mutex_unix.slo
+	$(SH_LINK) -rpath $(libexecdir) -module -avoid-version mod_fcgid.lo fcgid_bridge.lo fcgid_conf.lo fcgid_pm_main.lo fcgid_protocol.lo fcgid_spawn_ctl.lo  fcgid_proctbl_unix.lo fcgid_pm_unix.lo fcgid_proc_unix.lo fcgid_bucket.lo fcgid_filter.lo fcgid_mutex_unix.lo
+DISTCLEAN_TARGETS = modules.mk
+static =
+shared =  mod_fcgid.la
+