packages: apache/apache.spec - adapter
glen
glen at pld-linux.org
Sat Mar 10 11:21:17 CET 2012
Author: glen Date: Sat Mar 10 10:21:17 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- adapter
---- Files affected:
packages/apache:
apache.spec (1.672 -> 1.673)
---- Diffs:
================================================================
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.672 packages/apache/apache.spec:1.673
--- packages/apache/apache.spec:1.672 Mon Feb 27 00:53:03 2012
+++ packages/apache/apache.spec Sat Mar 10 11:21:12 2012
@@ -93,9 +93,9 @@
Patch23: %{name}-suexec_fcgi.patch
# http://scripts.mit.edu/trac/browser/trunk/server/common/patches/httpd-2.2.x-mod_ssl-sessioncaching.patch?rev=1348
Patch25: httpd-2.2.x-mod_ssl-sessioncaching.patch
-Patch26: apache-mod_vhost_alias_docroot.patch
+Patch26: %{name}-mod_vhost_alias_docroot.patch
# http://mpm-itk.sesse.net/
-Patch28: apache-mpm-itk.patch
+Patch28: %{name}-mpm-itk.patch
Patch29: libtool-tag.patch
URL: http://httpd.apache.org/
BuildRequires: apr-devel >= %{apr_ver}
@@ -344,13 +344,13 @@
Provides: apache(mod_access_compat) = %{version}-%{release}
%description mod_access_compat
-The directives provided by mod_access_compat are used in <Directory>,
+The directives provided by mod_access_compat are used in <Directory>,
<Files>, and <Location> sections as well as .htaccess files to control
-access to particular parts of the server. Access can be controlled
-based on the client hostname, IP address, or other characteristics of
-the client request, as captured in environment variables. The Allow
-and Deny directives are used to specify which clients are or are not
-allowed access to the server, while the Order directive sets the
+access to particular parts of the server. Access can be controlled
+based on the client hostname, IP address, or other characteristics of
+the client request, as captured in environment variables. The Allow
+and Deny directives are used to specify which clients are or are not
+allowed access to the server, while the Order directive sets the
default access state, and configures how the Allow and Deny directives
interact with each other.
@@ -546,9 +546,9 @@
%description mod_auth_form
This module allows the use of an HTML login form to restrict access by
looking up users in the given providers. HTML forms require
-significantly more configuration than the alternatives,
-however an HTML login form can provide a much friendlier experience
-for end users.
+significantly more configuration than the alternatives, however an
+HTML login form can provide a much friendlier experience for end
+users.
%package mod_authn_anon
Summary: Apache module that allows "anonymous" user access to authenticated areas
@@ -1066,7 +1066,7 @@
%description mod_data
This module provides the ability to convert a response into an RFC2397
-data URL.
+data URL.
Data URLs can be embedded inline within web pages using something like
the mod_include module, to remove the need for clients to make
@@ -1384,7 +1384,7 @@
mod_heartmonitor listens for server status messages generated by
mod_heartbeat enabled origin servers and makes their status available
to mod_lbmethod_heartbeat. This allows ProxyPass to use the
-"heartbeat" lbmethod inside of ProxyPass.
+"heartbeat" lbmethod inside of ProxyPass.
This module uses the services of mod_slotmem_shm when available
instead of flat-file storage. No configuration is required to use
@@ -1714,7 +1714,7 @@
environment variable rate-limit.
%package mod_reflector
-Summary: Reflect a request body as a response via the output filter stack.
+Summary: Reflect a request body as a response via the output filter stack
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_reflector.html
Requires: %{name}-base = %{version}-%{release}
@@ -1728,7 +1728,7 @@
filter into an HTTP service.
%package mod_remoteip
-Summary: Replaces the original client IP address for the connectionwith the useragent IP address list presented by a proxies or a load balancervia the request headers.
+Summary: Replaces the original client IP address for the connectionwith the useragent IP address list presented by a proxies or a load balancervia the request headers
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_remoteip.html
Requires: %{name}-base = %{version}-%{release}
@@ -1807,15 +1807,15 @@
take data from standard input. Instead, the filter acts on the entity
data sent between client and server. mod_sed can be used as an input
or output filter. mod_sed is a content filter, which means that it
-cannot be used to modify client or server http headers.
+cannot be used to modify client or server http headers.
The mod_sed output filter accepts a chunk of data, executes the sed
scripts on the data, and generates the output which is passed to the
-next filter in the chain.
+next filter in the chain.
The mod_sed input filter reads the data from the next filter in the
chain, executes the sed scripts, and returns the generated data to the
-caller filter in the filter chain.
+caller filter in the filter chain.
Both the input and output filters only process the data if newline
characters are seen in the content. At the end of the data, the rest
@@ -1924,7 +1924,7 @@
części serwera do podejmowania decyzji o podejmowanych akcjach.
%package mod_slotmem_plain
-Summary: Slot-based shared memory provider.
+Summary: Slot-based shared memory provider
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_slotmem_plain.html
Requires: %{name}-base = %{version}-%{release}
@@ -1933,13 +1933,13 @@
%description mod_slotmem_plain
mod_slotmem_plain is a memory provider which provides for creation and
access to a plain memory segment in which the datasets are organized
-in "slots."
+in "slots."
If the memory needs to be shared between threads and processes, a
better provider would be mod_slotmem_shm.
%package mod_slotmem_shm
-Summary: Slot-based shared memory provider.
+Summary: Slot-based shared memory provider
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_slotmem_shm.html
Requires: %{name}-base = %{version}-%{release}
@@ -1948,14 +1948,14 @@
%description mod_slotmem_shm
mod_slotmem_shm is a memory provider which provides for creation and
access to a shared memory segment in which the datasets are organized
-in "slots."
+in "slots."
All shared memory is cleared and cleaned with each restart, whether
graceful or not. The data itself is stored and restored within a file
noted by the name parameter in the create and attach calls.
%package mod_socache_dbm
-Summary: DBM based shared object cache provider.
+Summary: DBM based shared object cache provider
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_socache_dbm.html
Requires: %{name}-base = %{version}-%{release}
@@ -1966,7 +1966,7 @@
creation and access to a cache backed by a DBM database.
%package mod_socache_memcache
-Summary: Memcache based shared object cache provider.
+Summary: Memcache based shared object cache provider
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_socache_memcache.html
Requires: %{name}-base = %{version}-%{release}
@@ -1978,7 +1978,7 @@
high-performance, distributed memory object caching system.
%package mod_socache_shmcb
-Summary: shmcb based shared object cache provider.
+Summary: shmcb based shared object cache provider
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_socache_shmcb.html
Requires: %{name}-base = %{version}-%{release}
@@ -2398,7 +2398,7 @@
$RPM_BUILD_ROOT%{_var}/{log/{httpd,archive/httpd},{run,cache}/httpd,lock/mod_dav} \
$RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d,vhosts.d} \
$RPM_BUILD_ROOT%{_datadir}/{cgi-bin,vhosts} \
- $RPM_BUILD_ROOT/usr/lib/tmpfiles.d \
+ $RPM_BUILD_ROOT%{systemdtmpfilesdir} \
$RPM_BUILD_ROOT%{systemdunitdir}
%{__make} -C build install \
@@ -2453,7 +2453,7 @@
cp -a %{SOURCE22} $CFG/20_languages.conf
cp -a %{SOURCE29} $RPM_BUILD_ROOT%{_sysconfdir}/vhosts.d/example.net.conf
-install %{SOURCE30} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+install %{SOURCE30} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
echo "LoadModule access_compat_module modules/mod_access_compat.so" > $CFG/00_mod_access_compat.conf
echo "LoadModule actions_module modules/mod_actions.so" > $CFG/00_mod_actions.conf
@@ -2938,7 +2938,7 @@
%dir %attr(770,root,http) /var/run/httpd
%dir %attr(770,root,http) /var/cache/httpd
-/usr/lib/tmpfiles.d/%{name}.conf
+%{systemdtmpfilesdir}/%{name}.conf
%{systemdunitdir}/httpd.service
%config(noreplace) %verify(not md5 mtime size) /etc/systemd/system/httpd.service
@@ -3520,6 +3520,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.673 2012/03/10 10:21:12 glen
+- adapter
+
Revision 1.672 2012/02/26 23:53:03 adamg
- not sure if we need fcgistarter to have suid bit set
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.672&r2=1.673&f=u
More information about the pld-cvs-commit
mailing list