packages: 389-admin/389-admin.spec, 389-admin/389-admin-httpd.conf.patch (N...
aredridel
aredridel at pld-linux.org
Tue Feb 23 18:25:45 CET 2010
Author: aredridel Date: Tue Feb 23 17:25:45 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- add httpd.conf patch
---- Files affected:
packages/389-admin:
389-admin.spec (1.5 -> 1.6) , 389-admin-httpd.conf.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/389-admin/389-admin.spec
diff -u packages/389-admin/389-admin.spec:1.5 packages/389-admin/389-admin.spec:1.6
--- packages/389-admin/389-admin.spec:1.5 Tue Feb 23 16:25:41 2010
+++ packages/389-admin/389-admin.spec Tue Feb 23 18:25:40 2010
@@ -16,7 +16,7 @@
URL: http://directory.fedoraproject.org/
Source0: http://directory.fedoraproject.org/sources/%{name}-%{version}%{subver}.tar.bz2
# Source0-md5: 2d5c5e2058429086bbced744590aba7f
-#Patch1: f11-httpd.patch
+Patch0: %{name}-httpd.conf.patch
BuildRequires: 389-adminutil-devel
BuildRequires: apache-devel
BuildRequires: apr-devel
@@ -41,8 +41,6 @@
Requires: apache-mod_auth_basic
Requires: apache-mod_authn_file
Requires: apache-mod_authz_host
-Requires: apache-mod_cache
-Requires: apache-mod_deflate
Requires: apache-mod_dir
Requires: apache-mod_env
Requires: apache-mod_expires
@@ -81,7 +79,7 @@
%prep
%setup -q -n %{name}-%{version}%{subver}
-#%patch1
+%patch0 -p1
%build
%{__aclocal} -I m4
@@ -205,6 +203,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.6 2010/02/23 17:25:40 aredridel
+- add httpd.conf patch
+
Revision 1.5 2010/02/23 15:25:41 glen
- sort and uniq apache br, but these seem superfluous
================================================================
Index: packages/389-admin/389-admin-httpd.conf.patch
diff -u /dev/null packages/389-admin/389-admin-httpd.conf.patch:1.1
--- /dev/null Tue Feb 23 18:25:45 2010
+++ packages/389-admin/389-admin-httpd.conf.patch Tue Feb 23 18:25:40 2010
@@ -0,0 +1,346 @@
+diff -ur 389-admin-1.1.11.a1-o/admserv/cfgstuff/httpd-2.2.conf.in 389-admin-1.1.11.a1/admserv/cfgstuff/httpd-2.2.conf.in
+--- 389-admin-1.1.11.a1-o/admserv/cfgstuff/httpd-2.2.conf.in 2010-02-23 09:59:39.000000000 -0700
++++ 389-admin-1.1.11.a1/admserv/cfgstuff/httpd-2.2.conf.in 2010-02-23 10:24:14.000000000 -0700
+@@ -124,23 +124,15 @@
+ LoadModule env_module @moddir@/mod_env.so
+ LoadModule mime_magic_module @moddir@/mod_mime_magic.so
+ LoadModule expires_module @moddir@/mod_expires.so
+-<IfDefine !OmitDeflate>
+-LoadModule deflate_module @moddir@/mod_deflate.so
+-</IfDefine>
+ LoadModule headers_module @moddir@/mod_headers.so
+ LoadModule unique_id_module @moddir@/mod_unique_id.so
+ LoadModule setenvif_module @moddir@/mod_setenvif.so
+ LoadModule mime_module @moddir@/mod_mime.so
+-LoadModule vhost_alias_module @moddir@/mod_vhost_alias.so
+ LoadModule negotiation_module @moddir@/mod_negotiation.so
+ LoadModule dir_module @moddir@/mod_dir.so
+ LoadModule actions_module @moddir@/mod_actions.so
+ LoadModule alias_module @moddir@/mod_alias.so
+ LoadModule rewrite_module @moddir@/mod_rewrite.so
+-LoadModule cache_module @moddir@/mod_cache.so
+-LoadModule disk_cache_module @moddir@/mod_disk_cache.so
+-LoadModule file_cache_module @moddir@/mod_file_cache.so
+-LoadModule mem_cache_module @moddir@/mod_mem_cache.so
+ LoadModule cgi_module @moddir@/mod_cgi.so
+ LoadModule restartd_module @admmoddir@/mod_restartd.so
+ LoadModule nss_module @nssmoddir@/libmodnss.so
+@@ -148,38 +140,6 @@
+
+ ### Section 2: 'Main' server configuration
+ #
+-# The directives in this section set up the values used by the 'main'
+-# server, which responds to any requests that aren't handled by a
+-# <VirtualHost> definition. These values also provide defaults for
+-# any <VirtualHost> containers you may define later in the file.
+-#
+-# All of these directives may appear inside <VirtualHost> containers,
+-# in which case these default settings will be overridden for the
+-# virtual host being defined.
+-#
+-
+-#
+-# ServerAdmin: Your address, where problems with the server should be
+-# e-mailed. This address appears on some server-generated pages, such
+-# as error documents. e.g. admin at your-domain.com
+-#
+-#ServerAdmin you at example.com
+-
+-#
+-# ServerName gives the name and port that the server uses to identify itself.
+-# This can often be determined automatically, but we recommend you specify
+-# it explicitly to prevent problems during startup.
+-#
+-# If this is not set to valid DNS name for your host, server-generated
+-# redirections will not work. See also the UseCanonicalName directive.
+-#
+-# If your host doesn't have a registered DNS name, enter its IP address here.
+-# You will have to access it by its address anyway, and this will make
+-# redirections work in a sensible way.
+-#
+-#ServerName www.example.com:80
+-
+-#
+ # UseCanonicalName: Determines how Apache constructs self-referencing
+ # URLs and the SERVER_NAME and SERVER_PORT variables.
+ # When set "Off", Apache will use the Hostname and Port supplied
+@@ -313,25 +273,6 @@
+ HostnameLookups Off
+
+ #
+-# EnableMMAP: Control whether memory-mapping is used to deliver
+-# files (assuming that the underlying OS supports it).
+-# The default is on; turn this off if you serve from NFS-mounted
+-# filesystems. On some systems, turning it off (regardless of
+-# filesystem) can improve performance; for details, please see
+-# http://httpd.apache.org/docs-2.0/mod/core.html#enablemmap
+-#
+-#EnableMMAP off
+-
+-#
+-# EnableSendfile: Control whether the sendfile kernel support is
+-# used to deliver files (assuming that the OS supports it).
+-# The default is on; turn this off if you serve from NFS-mounted
+-# filesystems. Please see
+-# http://httpd.apache.org/docs-2.0/mod/core.html#enablesendfile
+-#
+-#EnableSendfile off
+-
+-#
+ # LogLevel: Control the number of messages logged to the error_log.
+ # Possible values include: debug, info, notice, warn, error, crit,
+ # alert, emerg.
+@@ -361,26 +302,6 @@
+ ServerSignature On
+
+ #
+-# Aliases: Add here as many aliases as you need (with no limit). The format is
+-# Alias fakename realname
+-#
+-# Note that if you include a trailing / on fakename then the server will
+-# require it to be present in the URL. So "/icons" isn't aliased in this
+-# example, only "/icons/". If the fakename is slash-terminated, then the
+-# realname must also be slash terminated, and if the fakename omits the
+-# trailing slash, the realname must also omit it.
+-#
+-# We include the /icons/ alias for FancyIndexed directory listings. If you
+-# do not use FancyIndexing, you may comment this out.
+-#
+-
+-#
+-# This should be changed to the ServerRoot/manual/. The alias provides
+-# the manual, even if you choose to move your DocumentRoot. You may comment
+-# this out if you do not care for the documentation.
+-#
+-
+-#
+ # ScriptAlias: This controls which directories contain server scripts.
+ # ScriptAliases are essentially the same as Aliases, except that
+ # documents in the realname directory are treated as applications and
+@@ -401,13 +322,6 @@
+ Scriptsock @piddir@/admin-serv.cgisock
+
+ #
+-# Redirect allows you to tell clients about documents which used to exist in
+-# your server's namespace, but do not anymore. This allows you to tell the
+-# clients where to look for the relocated document.
+-# Example:
+-# Redirect permanent /foo http://www.example.com/bar
+-
+-#
+ # DefaultLanguage and AddLanguage allows you to specify the language of
+ # a document. You can then use content negotiation to give a browser a
+ # file in a language the user can understand.
+@@ -534,135 +448,12 @@
+ AddCharset EUC-KR .euc-kr
+ AddCharset shift_jis .sjis
+
+-#
+-# AddType allows you to add to or override the MIME configuration
+-# file mime.types for specific file types.
+-#
+-#AddType application/x-tar .tgz
+-#
+-# AddEncoding allows you to have certain browsers uncompress
+-# information on the fly. Note: Not all browsers support this.
+-# Despite the name similarity, the following Add* directives have nothing
+-# to do with the FancyIndexing customization directives above.
+-#
+-#AddEncoding x-compress .Z
+-#AddEncoding x-gzip .gz .tgz
+-#
+-# If the AddEncoding directives above are commented-out, then you
+-# probably should define those extensions to indicate media types:
+-#
+ AddType application/x-compress .Z
+ AddType application/x-gzip .gz .tgz
+
+-#
+-# AddHandler allows you to map certain file extensions to "handlers":
+-# actions unrelated to filetype. These can be either built into the server
+-# or added with the Action directive (see below)
+-#
+-# To use CGI scripts outside of ScriptAliased directories:
+-# (You will also need to add "ExecCGI" to the "Options" directive.)
+-#
+-#AddHandler cgi-script .cgi
+-
+-#
+-# For files that include their own HTTP headers:
+-#
+-#AddHandler send-as-is asis
+-
+-#
+-# For server-parsed imagemap files:
+-#
+-#AddHandler imap-file map
+-
+-#
+-# For type maps (negotiated resources):
+-# (This is enabled by default to allow the Apache "It Worked" page
+-# to be distributed in multiple languages.)
+-#
+ AddHandler type-map var
+
+ #
+-# Filters allow you to process content before it is sent to the client.
+-#
+-# To parse .shtml files for server-side includes (SSI):
+-# (You will also need to add "Includes" to the "Options" directive.)
+-#
+-#AddType text/html .shtml
+-#AddOutputFilter INCLUDES .shtml
+-
+-#
+-# Action lets you define media types that will execute a script whenever
+-# a matching file is called. This eliminates the need for repeated URL
+-# pathnames for oft-used CGI file processors.
+-# Format: Action media/type /cgi-script/location
+-# Format: Action handler-name /cgi-script/location
+-#
+-
+-#
+-# Customizable error responses come in three flavors:
+-# 1) plain text 2) local redirects 3) external redirects
+-#
+-# Some examples:
+-#ErrorDocument 500 "The server made a boo boo."
+-#ErrorDocument 404 /missing.html
+-#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
+-#ErrorDocument 402 http://www.example.com/subscription_info.html
+-#
+-
+-#
+-# Putting this all together, we can internationalize error responses.
+-#
+-# We use Alias to redirect any /error/HTTP_<error>.html.var response to
+-# our collection of by-error message multi-language collections. We use
+-# includes to substitute the appropriate text.
+-#
+-# You can modify the messages' appearance without changing any of the
+-# default HTTP_<error>.html.var files by adding the line:
+-#
+-# Alias /error/include/ "/your/include/path/"
+-#
+-# which allows you to create your own set of files by starting with the
+-# /path/to/error/include/ files and copying them to /your/include/path/,
+-# even on a per-VirtualHost basis. The default include files will display
+-# your Apache version number and your ServerAdmin email address regardless
+-# of the setting of ServerSignature.
+-#
+-# The internationalized error documents require mod_alias, mod_include
+-# and mod_negotiation. To activate them, uncomment the following 30 lines.
+-
+-# Alias /error/ "/path/redhat/apache/error/"
+-#
+-# <Directory "/path/redhat/apache/error">
+-# AllowOverride None
+-# Options IncludesNoExec
+-# AddOutputFilter Includes html
+-# AddHandler type-map var
+-# Order allow,deny
+-# Allow from all
+-# LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr
+-# ForceLanguagePriority Prefer Fallback
+-# </Directory>
+-#
+-# ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
+-# ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
+-# ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
+-# ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
+-# ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
+-# ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
+-# ErrorDocument 410 /error/HTTP_GONE.html.var
+-# ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
+-# ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
+-# ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
+-# ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
+-# ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
+-# ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
+-# ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
+-# ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
+-# ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
+-# ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
+-
+-
+-#
+ # The following directives modify normal HTTP response behavior to
+ # handle known problems with browser implementations.
+ #
+@@ -672,76 +463,6 @@
+ BrowserMatch "Java/1\.0" force-response-1.0
+ BrowserMatch "JDK/1\.0" force-response-1.0
+
+-#
+-# The following directive disables redirects on non-GET requests for
+-# a directory that does not include the trailing slash. This fixes a
+-# problem with Microsoft WebFolders which does not appropriately handle
+-# redirects for folders with DAV methods.
+-# Same deal with Apple's DAV filesystem and Gnome VFS support for DAV.
+-#
+-BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
+-BrowserMatch "^WebDrive" redirect-carefully
+-BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
+-BrowserMatch "^gnome-vfs" redirect-carefully
+-
+-#
+-# Allow server status reports generated by mod_status,
+-# with the URL of http://servername/server-status
+-# Change the ".example.com" to match your domain to enable.
+-#
+-#<Location /server-status>
+-# SetHandler server-status
+-# Order deny,allow
+-# Deny from all
+-# Allow from .example.com
+-#</Location>
+-
+-#
+-# Allow remote server configuration reports, with the URL of
+-# http://servername/server-info (requires that mod_info.c be loaded).
+-# Change the ".example.com" to match your domain to enable.
+-#
+-#<Location /server-info>
+-# SetHandler server-info
+-# Order deny,allow
+-# Deny from all
+-# Allow from .example.com
+-#</Location>
+-
+-
+-### Section 3: Virtual Hosts
+-#
+-# VirtualHost: If you want to maintain multiple domains/hostnames on your
+-# machine you can setup VirtualHost containers for them. Most configurations
+-# use only name-based virtual hosts so the server doesn't need to worry about
+-# IP addresses. This is indicated by the asterisks in the directives below.
+-#
+-# Please see the documentation at
+-# <URL:http://httpd.apache.org/docs-2.0/vhosts/>
+-# for further details before you try to setup virtual hosts.
+-#
+-# You may use the command line option '-S' to verify your virtual host
+-# configuration.
+-
+-#
+-# Use name-based virtual hosting.
+-#
+-#NameVirtualHost *:80
+-
+-#
+-# VirtualHost example:
+-# Almost any Apache directive may go into a VirtualHost container.
+-# The first VirtualHost section is used for requests without a known
+-# server name.
+-#
+-#<VirtualHost *:80>
+-# ServerAdmin webmaster at dummy-host.example.com
+-# DocumentRoot /www/docs/dummy-host.example.com
+-# ServerName dummy-host.example.com
+-# ErrorLog logs/dummy-host.example.com-error_log
+-# CustomLog logs/dummy-host.example.com-access_log common
+-#</VirtualHost>
+-
+ Include @configdir@/admserv.conf
+ Include @configdir@/nss.conf
+ Include @configdir@/console.conf
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/389-admin/389-admin.spec?r1=1.5&r2=1.6&f=u
More information about the pld-cvs-commit
mailing list