Author: adamg Date: Sun Feb 26 12:43:06 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- merge mod_unixd into -base, it's required anyway
---- Files affected:
packages/apache:
apache.spec (1.658 -> 1.659)
---- Diffs:
================================================================
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.658 packages/apache/apache.spec:1.659
--- packages/apache/apache.spec:1.658 Sun Feb 26 12:23:41 2012
+++ packages/apache/apache.spec Sun Feb 26 13:43:00 2012
@@ -192,7 +192,6 @@
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd
Requires: /sbin/chkconfig
-Requires: %{name}-mod_unixd = %{version}-%{release}
Requires: apr >= %{apr_ver}
Requires: psmisc >= 20.1
Requires: rc-scripts >= 0.4.1.23
@@ -1927,16 +1926,6 @@
maszyn. Moduł ustawia przy każdym zapytaniu zmienną środowiskową
UNIQUE_ID.
-%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_userdir
Summary: User-specific directories
Summary(pl.UTF-8): Katalogi specyficzne dla użytkowników
@@ -2347,7 +2336,6 @@
echo "LoadModule speling_module modules/mod_speling.so" >
$CFG/00_mod_speling.conf
echo "LoadModule substitute_module modules/mod_substitute.so" >
$CFG/00_mod_substitute.conf
echo "LoadModule unique_id_module modules/mod_unique_id.so" >
$CFG/00_mod_unique_id.conf
-echo "LoadModule unixd_module modules/mod_unixd.so" > $CFG/00_mod_unixd.conf
echo "LoadModule usertrack_module modules/mod_usertrack.so" >
$CFG/00_mod_usertrack.conf
echo "LoadModule version_module modules/mod_version.so" >
$CFG/00_mod_version.conf
echo "LoadModule watchdog_module modules/mod_watchdog.so" >
$CFG/00_mod_watchdog.conf
@@ -2663,7 +2651,6 @@
%module_scripts mod_status
%module_scripts mod_substitute
%module_scripts mod_unique_id
-%module_scripts mod_unixd
%module_scripts mod_userdir
%module_scripts mod_usertrack
%module_scripts mod_version
@@ -2748,6 +2735,7 @@
%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
%files doc -f manual.files
%defattr(644,root,root,755)
@@ -3253,11 +3241,6 @@
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/*_mod_unique_id.conf
%attr(755,root,root) %{_libexecdir}/mod_unique_id.so
-%files mod_unixd
-%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/*_mod_unixd.conf
-%attr(755,root,root) %{_libexecdir}/mod_unixd.so
-
%files mod_userdir
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/*_mod_userdir.conf
@@ -3313,6 +3296,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.659 2012/02/26 12:43:00 adamg
+- merge mod_unixd into -base, it's required anyway
+
Revision 1.658 2012/02/26 11:23:41 adamg
- fix Obsoletes in mod_auth{n,z}_core
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.658&r2=1.659&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
