From e0a3ddd250c95493d1fbaaee51ff6842e3e69633 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Adam=20Go=C5=82=C4=99biowski?= Date: Sun, 26 Feb 2012 14:07:58 +0100 Subject: [PATCH] - merge mod_unixd into -base, it's required anyway --- apache-httpd.conf | 2 +- apache.spec | 21 ++------------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/apache-httpd.conf b/apache-httpd.conf index 9a203f0..4638984 100644 --- a/apache-httpd.conf +++ b/apache-httpd.conf @@ -8,7 +8,7 @@ # In particular, see # # for a discussion of each configuration directive. - +LoadModule unixd_module modules/mod_unixd.so ServerRoot "/etc/httpd" DefaultType none diff --git a/apache.spec b/apache.spec index 27a9390..6dfd93b 100644 --- a/apache.spec +++ b/apache.spec @@ -189,7 +189,6 @@ Requires: /sbin/chkconfig Requires: apr >= %{apr_ver} Requires: psmisc >= 20.1 Requires: rc-scripts >= 0.4.1.23 -Requires: %{name}-mod_unixd = %{version}-%{release} Provides: apache(modules-api) = %{_apache_modules_api} Provides: group(http) Provides: user(http) @@ -1968,16 +1967,6 @@ Provides: apache(mod_socache_shmcb) = %{version}-%{release} %description mod_socache Shared object cache provider. -%package mod_unixd -Summary: Basic (required) security for Unix-family platforms -Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.4/mod/mod_unixd.html -Requires: %{name}-base = %{version}-%{release} -Provides: apache(mod_unixd) = %{version}-%{release} - -%description mod_unixd -Basic (required) security for Unix-family platforms. - %package mod_watchdog Summary: Provides infrastructure for other modules to periodically run tasks Group: Networking/Daemons/HTTP @@ -2303,7 +2292,6 @@ echo "#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so" >> $CFG/00_mod_ echo "#LoadModule socache_dbm_module modules/mod_socache_dbm.so" > $CFG/00_mod_socache.conf echo "#LoadModule socache_memcache_module modules/mod_socache_memcache.so" >> $CFG/00_mod_socache.conf echo "#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so" >> $CFG/00_mod_socache.conf -echo "LoadModule unixd_module modules/mod_unixd.so" > $CFG/00_mod_unixd.conf echo "LoadModule watchdog_module modules/mod_watchdog.so" > $CFG/00_mod_watchdog.conf echo "LoadModule xml2enc_module modules/mod_xml2enc.so" > $CFG/00_mod_xml2enc.conf @@ -2623,7 +2611,6 @@ fi %module_scripts mod_session %module_scripts mod_slotmem %module_scripts mod_socache -%module_scripts mod_unixd %module_scripts mod_watchdog %module_scripts mod_xml2enc @@ -2669,10 +2656,11 @@ fi %attr(640,root,root) %{_sysconfdir}/magic %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/httpd %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/* -# MPM modules +# required modules %attr(755,root,root) %{_libexecdir}/mod_mpm_event.so %attr(755,root,root) %{_libexecdir}/mod_mpm_prefork.so %attr(755,root,root) %{_libexecdir}/mod_mpm_worker.so +%attr(755,root,root) %{_libexecdir}/mod_unixd.so %dir %{_libexecdir} @@ -3186,11 +3174,6 @@ fi %attr(755,root,root) %{_libexecdir}/mod_socache_memcache.so %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_socache.conf -%files mod_unixd -%defattr(644,root,root,755) -%attr(755,root,root) %{_libexecdir}/mod_unixd.so -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_unixd.conf - %files mod_watchdog %defattr(644,root,root,755) %attr(755,root,root) %{_libexecdir}/mod_watchdog.so -- 2.46.0