rpms/apache
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix update_httpdconf.sh script for 64 bit (/usr/lib64) support [release 2.4.20-3mamba;Sat Jun 11 2016]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-05 20:27:08 +01:00
parent 6c25faebef
commit 3e427285e0
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apache.spec
View File

@ -6,7 +6,7 @@
Name: apache Name: apache
Version: 2.4.20 Version: 2.4.20
Release: 1mamba Release: 3mamba
Epoch: 1 Epoch: 1
Summary: The Apache webserver Summary: The Apache webserver
Group: System/Servers Group: System/Servers
@ -202,6 +202,7 @@ _EOF
--disable-example \ --disable-example \
--enable-distcache \ --enable-distcache \
--enable-http=yes \ --enable-http=yes \
--enable-mpms-shared=all \
--with-z=%{_prefix} \ --with-z=%{_prefix} \
--with-ssl=%{_prefix} \ --with-ssl=%{_prefix} \
--with-pcre=%{_prefix} --with-pcre=%{_prefix}
@ -301,7 +302,7 @@ if [ $1 -eq 1 ]; then
fi fi
if [ $1 -ge 1 ]; then if [ $1 -ge 1 ]; then
apxs -e -a -n slotmem_shm %{_libdir}/apache/mod_slotmem_shm.so apxs -e -a -n slotmem_shm %{_libdir}/apache/mod_slotmem_shm.so 2>/dev/null
sed -i "s|Include[[:space:]]\(/etc/httpd/httpd\.d/\*\.conf\)|IncludeOptional \1|" %{_sysconfdir}/httpd/httpd.conf sed -i "s|Include[[:space:]]\(/etc/httpd/httpd\.d/\*\.conf\)|IncludeOptional \1|" %{_sysconfdir}/httpd/httpd.conf
systemd-tmpfiles --create httpd.conf systemd-tmpfiles --create httpd.conf
systemctl -q daemon-reload systemctl -q daemon-reload
@ -435,6 +436,12 @@ exit 0
%{_libdir}/apache/mod_suexec.so %{_libdir}/apache/mod_suexec.so
%changelog %changelog
* Sat Jun 11 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 2.4.20-3mamba
- fix update_httpdconf.sh script for 64 bit (/usr/lib64) support
* Sat May 28 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 2.4.20-2mamba
- rebuilt with --enable-mpms-shared=all
* Tue Apr 26 2016 Automatic Build System <autodist@mambasoft.it> 2.4.20-1mamba * Tue Apr 26 2016 Automatic Build System <autodist@mambasoft.it> 2.4.20-1mamba
- automatic version update by autodist - automatic version update by autodist

8
httpd-update_httpdconf.sh
View File

@ -1,11 +1,15 @@
#!/bin/bash #!/bin/bash
# update_httpdconf.sh - updates httpd.conf modules list # update_httpdconf.sh - updates httpd.conf modules list
# Copyright (c) 2006 by Silvan Calarco <silvan.calarco@qilinux.it> # Copyright (c) 2006-2016 by Silvan Calarco <silvan.calarco@qilinux.it>
INPUT_CONF=/etc/httpd/httpd.conf.rpmnew INPUT_CONF=/etc/httpd/httpd.conf.rpmnew
OUTPUT_CONF=/etc/httpd/httpd.conf OUTPUT_CONF=/etc/httpd/httpd.conf
MODULES_PREFIX=/usr MODULES_PREFIX=/usr
MODULES_APPEND=lib/apache if [ -d /usr/lib64/apache ]; then
MODULES_APPEND=lib64/apache
else
MODULES_APPEND=lib/apache
fi
MODULES_PATH=$MODULES_PREFIX/$MODULES_APPEND MODULES_PATH=$MODULES_PREFIX/$MODULES_APPEND
cont=0 cont=0