diff -ur gentoo-apache-2.2.4-r11/conf/apache2-builtin-mods gentoo-apache-2.2.4-r11.patched/conf/apache2-builtin-mods --- gentoo-apache-2.2.4-r11/conf/apache2-builtin-mods 2007-06-05 07:55:59 -0400 +++ gentoo-apache-2.2.4-r11.patched/conf/apache2-builtin-mods 2007-08-05 23:18:11 -0400 @@ -1,7 +1,7 @@ -# This file will be installed into /etc/apache2 when you first emerge +# This file will be installed into XXX_EPREFIX_XXX/etc/apache2 when you first emerge # Apache2. If/when you upgrade, it will be consulted for your options, # thus preserving your previous configuration. The default configuration -# in files/ is used if the one in /etc/apache2 isn't available. +# in files/ is used if the one in XXX_EPREFIX_XXX/etc/apache2 isn't available. # # The syntax in this file has recently changed. To build a static module, put # 'static' next to it. To build a DSO module, put 'shared' next to it. To diff -ur gentoo-apache-2.2.4-r11/conf/httpd.conf gentoo-apache-2.2.4-r11.patched/conf/httpd.conf --- gentoo-apache-2.2.4-r11/conf/httpd.conf 2007-07-30 13:47:57 -0400 +++ gentoo-apache-2.2.4-r11.patched/conf/httpd.conf 2007-08-05 23:18:44 -0400 @@ -36,7 +36,7 @@ # ServerRoot at a non-local disk, be sure to point the LockFile directive # at a local disk. If you wish to share the same ServerRoot for multiple # httpd daemons, you will need to change at least LockFile and PidFile. -ServerRoot "/usr/lib/apache2" +ServerRoot "XXX_EPREFIX_XXX/usr/lib/apache2" # Dynamic Shared Object (DSO) Support # @@ -64,8 +64,8 @@ # User/Group: The name (or #number) of the user/group to run httpd as. # It is usually good practice to create a dedicated user and group for # running httpd, as with most system services. -User apache -Group apache +User XXX_WWW_USER_XXX +Group XXX_WWW_GROUP_XXX # Supplemental configuration # @@ -76,13 +76,13 @@ # To know which flag to add to APACHE2_OPTS, look at the first line of the # the file, which will usually be an where OPTIONS is the # flag to use. -Include /etc/apache2/modules.d/*.conf +Include XXX_EPREFIX_XXX/etc/apache2/modules.d/*.conf # Virtual-host support # # Gentoo has made using virtual-hosts easy. In /etc/apache2/vhosts.d/ we # include a default vhost (enabled by adding -D DEFAULT_VHOST to # APACHE2_OPTS in /etc/conf.d/apache2). -Include /etc/apache2/vhosts.d/*.conf +Include XXX_EPREFIX_XXX/etc/apache2/vhosts.d/*.conf # vim: ts=4 filetype=apache diff -ur gentoo-apache-2.2.4-r11/conf/modules.d/00_apache_manual.conf gentoo-apache-2.2.4-r11.patched/conf/modules.d/00_apache_manual.conf --- gentoo-apache-2.2.4-r11/conf/modules.d/00_apache_manual.conf 2007-06-05 09:19:05 -0400 +++ gentoo-apache-2.2.4-r11.patched/conf/modules.d/00_apache_manual.conf 2007-08-05 23:32:43 -0400 @@ -8,7 +8,7 @@ AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ "/usr/share/doc/apache-VERSION/manual$1" - + Options Indexes AllowOverride None Order allow,deny diff -ur gentoo-apache-2.2.4-r11/conf/modules.d/00_autoindex.conf gentoo-apache-2.2.4-r11.patched/conf/modules.d/00_autoindex.conf --- gentoo-apache-2.2.4-r11/conf/modules.d/00_autoindex.conf 2007-06-05 08:41:55 -0400 +++ gentoo-apache-2.2.4-r11.patched/conf/modules.d/00_autoindex.conf 2007-08-05 23:33:50 -0400 @@ -12,9 +12,9 @@ # We include the /icons/ alias for FancyIndexed directory listings. If # you do not use FancyIndexing, you may comment this out. -Alias /icons/ "/var/www/localhost/icons/" +Alias /icons/ "XXX_EPREFIX_XXX/var/www/localhost/icons/" - + Options Indexes MultiViews AllowOverride None Order allow,deny diff -ur gentoo-apache-2.2.4-r11/conf/modules.d/00_error_documents.conf gentoo-apache-2.2.4-r11.patched/conf/modules.d/00_error_documents.conf --- gentoo-apache-2.2.4-r11/conf/modules.d/00_error_documents.conf 2007-06-05 09:42:02 -0400 +++ gentoo-apache-2.2.4-r11.patched/conf/modules.d/00_error_documents.conf 2007-08-05 23:35:20 -0400 @@ -27,9 +27,9 @@ -Alias /error/ "/var/www/localhost/error/" +Alias /error/ "XXX_EPREFIX_XXX/var/www/localhost/error/" - + AllowOverride None Options IncludesNoExec AddOutputFilter Includes html diff -ur gentoo-apache-2.2.4-r11/conf/modules.d/00_mod_log_config.conf gentoo-apache-2.2.4-r11.patched/conf/modules.d/00_mod_log_config.conf --- gentoo-apache-2.2.4-r11/conf/modules.d/00_mod_log_config.conf 2007-06-05 09:44:59 -0400 +++ gentoo-apache-2.2.4-r11.patched/conf/modules.d/00_mod_log_config.conf 2007-08-05 23:35:52 -0400 @@ -3,7 +3,7 @@ # container, error messages relating to that virtual host will be # logged here. If you *do* define an error logfile for a # container, that host's errors will be logged there and not here. -ErrorLog /var/log/apache2/error_log +ErrorLog XXX_EPREFIX_XXX/var/log/apache2/error_log # LogLevel: Control the number of messages logged to the error_log. # Possible values include: debug, info, notice, warn, error, crit, @@ -31,16 +31,16 @@ # container, they will be logged here. Contrariwise, if you *do* # define per- access logfiles, transactions will be # logged therein and *not* in this file. -CustomLog /var/log/apache2/access_log common +CustomLog XXX_EPREFIX_XXX/var/log/apache2/access_log common # If you would like to have agent and referer logfiles, # uncomment the following directives. -#CustomLog /var/log/apache2/referer_log referer -#CustomLog /var/log/apache2/agent_logs agent +#CustomLog XXX_EPREFIX_XXX/var/log/apache2/referer_log referer +#CustomLog XXX_EPREFIX_XXX/var/log/apache2/agent_logs agent # If you prefer a logfile with access, agent, and referer information # (Combined Logfile Format) you can use the following directive. -#CustomLog /var/log/apache2/access_log combined +#CustomLog XXX_EPREFIX_XXX/var/log/apache2/access_log combined # vim: ts=4 filetype=apache diff -ur gentoo-apache-2.2.4-r11/conf/modules.d/00_mod_mime.conf gentoo-apache-2.2.4-r11.patched/conf/modules.d/00_mod_mime.conf --- gentoo-apache-2.2.4-r11/conf/modules.d/00_mod_mime.conf 2007-06-05 09:45:13 -0400 +++ gentoo-apache-2.2.4-r11.patched/conf/modules.d/00_mod_mime.conf 2007-08-05 23:36:07 -0400 @@ -10,7 +10,7 @@ # TypesConfig points to the file containing the list of mappings from # filename extension to MIME-type. -TypesConfig /etc/mime.types +TypesConfig XXX_EPREFIX_XXX/etc/mime.types # AddType allows you to add to or override the MIME configuration # file specified in TypesConfig for specific file types. @@ -55,7 +55,7 @@ # The mod_mime_magic module allows the server to use various hints from the # contents of the file itself to determine its type. The MIMEMagicFile # directive tells the module where the hint definitions are located. -MIMEMagicFile /etc/apache2/magic +MIMEMagicFile XXX_EPREFIX_XXX/etc/apache2/magic # vim: ts=4 filetype=apache diff -ur gentoo-apache-2.2.4-r11/conf/modules.d/00_mod_userdir.conf gentoo-apache-2.2.4-r11.patched/conf/modules.d/00_mod_userdir.conf --- gentoo-apache-2.2.4-r11/conf/modules.d/00_mod_userdir.conf 2007-06-05 09:44:27 -0400 +++ gentoo-apache-2.2.4-r11.patched/conf/modules.d/00_mod_userdir.conf 2007-08-05 23:37:13 -0400 @@ -6,11 +6,11 @@ # UserDir: The name of the directory that is appended onto a user's home # directory if a ~user request is received. Note that you must also set # the default access control for these directories, as in the example below. -UserDir public_html +UserDir XXX_USERDIR_XXX # Control access to UserDir directories. The following is an example # for a site where these directories are restricted to read-only. - + AllowOverride FileInfo AuthConfig Limit Indexes Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec @@ -27,7 +27,7 @@ # idea if you have multiple users serving websites... - + Options ExecCGI SetHandler cgi-script diff -ur gentoo-apache-2.2.4-r11/conf/modules.d/00_mpm.conf gentoo-apache-2.2.4-r11.patched/conf/modules.d/00_mpm.conf --- gentoo-apache-2.2.4-r11/conf/modules.d/00_mpm.conf 2007-06-05 09:01:58 -0400 +++ gentoo-apache-2.2.4-r11.patched/conf/modules.d/00_mpm.conf 2007-08-05 23:38:05 -0400 @@ -4,13 +4,13 @@ # identification number when it starts. # # Note that this is the default PidFile for most MPMs. -PidFile /var/run/apache2.pid +PidFile XXX_EPREFIX_XXX/var/run/apache2.pid # The accept serialization lock file MUST BE STORED ON A LOCAL DISK. -#LockFile /var/run/apache2.lock +#LockFile XXX_EPREFIX_XXX/var/run/apache2.lock # Only one of the below sections will be relevant on your -# installed httpd. Use "/usr/sbin/apache2 -l" to find out the +# installed httpd. Use "XXX_EPREFIX_XXX/usr/sbin/apache2 -l" to find out the # active mpm. # prefork MPM @@ -83,7 +83,7 @@ Multiplexer nobody nobody - Processor apache apache + Processor XXX_WWW_USER_XXX XXX_WWW_GROUP_XXX # chroot dir is optional: # Processor user group /home/user diff -ur gentoo-apache-2.2.4-r11/conf/modules.d/40_mod_ssl.conf gentoo-apache-2.2.4-r11.patched/conf/modules.d/40_mod_ssl.conf --- gentoo-apache-2.2.4-r11/conf/modules.d/40_mod_ssl.conf 2007-06-15 14:34:18 -0400 +++ gentoo-apache-2.2.4-r11.patched/conf/modules.d/40_mod_ssl.conf 2007-08-05 23:38:49 -0400 @@ -52,13 +52,13 @@ # Configure the SSL Session Cache: First the mechanism to use and second the # expiring timeout (in seconds). #SSLSessionCache dbm:/var/run/ssl_scache -SSLSessionCache shmcb:/var/run/ssl_scache(512000) +SSLSessionCache shmcb:XXX_EPREFIX_XXX/var/run/ssl_scache(512000) SSLSessionCacheTimeout 300 ## Semaphore: # Configure the path to the mutual exclusion semaphore the SSL engine uses # internally for inter-process synchronization. -SSLMutex file:/var/run/ssl_mutex +SSLMutex file:XXX_EPREFIX_XXX/var/run/ssl_mutex diff -ur gentoo-apache-2.2.4-r11/conf/modules.d/45_mod_dav.conf gentoo-apache-2.2.4-r11.patched/conf/modules.d/45_mod_dav.conf --- gentoo-apache-2.2.4-r11/conf/modules.d/45_mod_dav.conf 2007-06-05 09:20:59 -0400 +++ gentoo-apache-2.2.4-r11.patched/conf/modules.d/45_mod_dav.conf 2007-08-05 23:39:33 -0400 @@ -1,23 +1,23 @@ -DavLockDB "/var/lib/dav/lockdb" +DavLockDB "XXX_EPREFIX_XXX/var/lib/dav/lockdb" # The following example gives DAV write access to a directory called # "uploads" under the ServerRoot directory. -Alias /uploads "/var/www/uploads" +Alias /uploads "XXX_EPREFIX_XXX/var/www/uploads" - + Dav On AuthType Digest AuthName DAV-upload # You can use the htdigest program to create the password database: - # htdigest -c "/var/www/.htpasswd-dav" DAV-upload admin - AuthUserFile "/var/www/.htpasswd-dav" + # htdigest -c "XXX_EPREFIX_XXX/var/www/.htpasswd-dav" DAV-upload admin + AuthUserFile "XXX_EPREFIX_XXX/var/www/.htpasswd-dav" # Allow universal read-access, but writes are restricted # to the admin user. diff -ur gentoo-apache-2.2.4-r11/conf/vhosts.d/00_default_ssl_vhost.conf gentoo-apache-2.2.4-r11.patched/conf/vhosts.d/00_default_ssl_vhost.conf --- gentoo-apache-2.2.4-r11/conf/vhosts.d/00_default_ssl_vhost.conf 2007-06-15 14:34:15 -0400 +++ gentoo-apache-2.2.4-r11.patched/conf/vhosts.d/00_default_ssl_vhost.conf 2007-08-06 01:50:36 -0400 @@ -6,14 +6,14 @@ # When we also provide SSL we have to listen to the HTTPS port # Note: Configurations that use IPv6 but not IPv4-mapped addresses need two # Listen directives: "Listen [::]:443" and "Listen 0.0.0.0:443" -Listen 443 +Listen XXX_WWW_SSL_PORT_XXX - - Include /etc/apache2/vhosts.d/default_vhost.include - ErrorLog /var/log/apache2/ssl_error_log + + Include XXX_EPREFIX_XXX/etc/apache2/vhosts.d/default_vhost.include + ErrorLog XXX_EPREFIX_XXX/var/log/apache2/ssl_error_log - TransferLog /var/log/apache2/ssl_access_log + TransferLog XXX_EPREFIX_XXX/var/log/apache2/ssl_access_log ## SSL Engine Switch: @@ -31,16 +31,16 @@ # kill -HUP will prompt again. Keep in mind that if you have both an RSA # and a DSA certificate you can configure both in parallel (to also allow # the use of DSA ciphers, etc.) - SSLCertificateFile /etc/apache2/ssl/server.crt - #SSLCertificateFile /etc/apache2/ssl/server-dsa.crt + SSLCertificateFile XXX_EPREFIX_XXX/etc/apache2/ssl/server.crt + #SSLCertificateFile XXX_EPREFIX_XXX/etc/apache2/ssl/server-dsa.crt ## Server Private Key: # If the key is not combined with the certificate, use this directive to # point at the key file. Keep in mind that if you've both a RSA and a DSA # private key you can configure both in parallel (to also allow the use of # DSA ciphers, etc.) - SSLCertificateKeyFile /etc/apache2/ssl/server.key - #SSLCertificateKeyFile /etc/apache2/ssl/server-dsa.key + SSLCertificateKeyFile XXX_EPREFIX_XXX/etc/apache2/ssl/server.key + #SSLCertificateKeyFile XXX_EPREFIX_XXX/etc/apache2/ssl/server-dsa.key ## Server Certificate Chain: # Point SSLCertificateChainFile at a file containing the concatenation of @@ -48,7 +48,7 @@ # server certificate. Alternatively the referenced file can be the same as # SSLCertificateFile when the CA certificates are directly appended to the # server certificate for convinience. - #SSLCertificateChainFile /etc/apache2/ssl/ca.crt + #SSLCertificateChainFile XXX_EPREFIX_XXX/etc/apache2/ssl/ca.crt ## Certificate Authority (CA): # Set the CA certificate verification path where to find CA certificates @@ -57,8 +57,8 @@ # Note: Inside SSLCACertificatePath you need hash symlinks to point to the # certificate files. Use the provided Makefile to update the hash symlinks # after changes. - #SSLCACertificatePath /etc/apache2/ssl/ssl.crt - #SSLCACertificateFile /etc/apache2/ssl/ca-bundle.crt + #SSLCACertificatePath XXX_EPREFIX_XXX/etc/apache2/ssl/ssl.crt + #SSLCACertificateFile XXX_EPREFIX_XXX/etc/apache2/ssl/ca-bundle.crt ## Certificate Revocation Lists (CRL): # Set the CA revocation path where to find CA CRLs for client authentication @@ -67,8 +67,8 @@ # Note: Inside SSLCARevocationPath you need hash symlinks to point to the # certificate files. Use the provided Makefile to update the hash symlinks # after changes. - #SSLCARevocationPath /etc/apache2/ssl/ssl.crl - #SSLCARevocationFile /etc/apache2/ssl/ca-bundle.crl + #SSLCARevocationPath XXX_EPREFIX_XXX/etc/apache2/ssl/ssl.crl + #SSLCARevocationFile XXX_EPREFIX_XXX/etc/apache2/ssl/ca-bundle.crl ## Client Authentication (Type): # Client certificate verification type and depth. Types are none, optional, @@ -129,7 +129,7 @@ SSLOptions +StdEnvVars - + SSLOptions +StdEnvVars @@ -169,7 +169,7 @@ # The home of a custom SSL log file. Use this when you want a compact # non-error SSL logfile on a virtual host basis. - CustomLog /var/log/apache2/ssl_request_log \ + CustomLog XXX_EPREFIX_XXX/var/log/apache2/ssl_request_log \ "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" diff -ur gentoo-apache-2.2.4-r11/conf/vhosts.d/00_default_vhost.conf gentoo-apache-2.2.4-r11.patched/conf/vhosts.d/00_default_vhost.conf --- gentoo-apache-2.2.4-r11/conf/vhosts.d/00_default_vhost.conf 2007-06-15 14:32:38 -0400 +++ gentoo-apache-2.2.4-r11.patched/conf/vhosts.d/00_default_vhost.conf 2007-08-06 01:50:42 -0400 @@ -23,10 +23,10 @@ # prevent Apache from glomming onto all bound IP addresses. # #Listen 12.34.56.78:80 -Listen 80 +Listen XXX_WWW_PORT_XXX # Use name-based virtual hosting. -NameVirtualHost *:80 +NameVirtualHost *:XXX_WWW_PORT_XXX # When virtual hosts are enabled, the main host defined in the default # httpd.conf configuration will go away. We redefine it here so that it is @@ -35,11 +35,11 @@ # If you disable this vhost by removing -D DEFAULT_VHOST from # /etc/conf.d/apache2, the first defined virtual host elsewhere will be # the default. - - Include /etc/apache2/vhosts.d/default_vhost.include + + Include XXX_EPREFIX_XXX/etc/apache2/vhosts.d/default_vhost.include - ServerEnvironment apache apache + ServerEnvironment XXX_WWW_USER_XXX XXX_WWW_GROUP_XXX diff -ur gentoo-apache-2.2.4-r11/conf/vhosts.d/default_vhost.include gentoo-apache-2.2.4-r11.patched/conf/vhosts.d/default_vhost.include --- gentoo-apache-2.2.4-r11/conf/vhosts.d/default_vhost.include 2007-07-30 13:23:18 -0400 +++ gentoo-apache-2.2.4-r11.patched/conf/vhosts.d/default_vhost.include 2007-08-05 23:43:24 -0400 @@ -9,18 +9,18 @@ # # If your host doesn't have a registered DNS name, enter its IP address here. # -#ServerName www.example.com:80 +#ServerName www.example.com:XXX_WWW_PORT_XXX # DocumentRoot: The directory out of which you will serve your # documents. By default, all requests are taken from this directory, but # symbolic links and aliases may be used to point to other locations. # -# If you change this to something that isn't under /var/www then suexec +# If you change this to something that isn't under XXX_EPREFIX_XXX/var/www then suexec # will no longer work. -DocumentRoot "/var/www/localhost/htdocs" +DocumentRoot "XXX_EPREFIX_XXX/var/www/localhost/htdocs" # This should be changed to whatever you set DocumentRoot to. - + # Possible values for the Options directive are "None", "All", # or any combination of: # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews @@ -66,12 +66,12 @@ # run by the server when requested rather than as documents sent to the # client. The same rules about trailing "/" apply to ScriptAlias # directives as to Alias. - ScriptAlias /cgi-bin/ "/var/www/localhost/cgi-bin/" + ScriptAlias /cgi-bin/ "XXX_EPREFIX_XXX/var/www/localhost/cgi-bin/" -# "/var/www/localhost/cgi-bin" should be changed to whatever your ScriptAliased +# "XXX_EPREFIX_XXX/var/www/localhost/cgi-bin" should be changed to whatever your ScriptAliased # CGI directory exists, if you have that configured. - + AllowOverride None Options None Order allow,deny diff -ur gentoo-apache-2.2.4-r11/patches/config.layout gentoo-apache-2.2.4-r11.patched/patches/config.layout --- gentoo-apache-2.2.4-r11/patches/config.layout 2007-06-05 07:13:46 -0400 +++ gentoo-apache-2.2.4-r11.patched/patches/config.layout 2007-08-06 00:29:35 -0400 @@ -1,23 +1,23 @@ - prefix: /usr - exec_prefix: /usr - bindir: /usr/bin - sbindir: /usr/sbin - libdir: /usr/lib - libexecdir: /usr/lib/apache2/modules - mandir: /usr/share/man - includedir: /usr/include/apache2 - installbuilddir: /usr/lib/apache2/build - datadir: /var/www/localhost - errordir: /var/www/localhost/error - iconsdir: /var/www/localhost/icons - htdocsdir: /var/www/localhost/htdocs - cgidir: /var/www/localhost/cgi-bin - manualdir: /usr/share/doc/version/manual - sysconfdir: /etc/apache2 - localstatedir: /var - runtimedir: /var/run - logfiledir: /var/log/apache2 - proxycachedir: /var/cache/apache2 + prefix: XXX_EPREFIX_XXX/usr + exec_prefix: XXX_EPREFIX_XXX/usr + bindir: XXX_EPREFIX_XXX/usr/bin + sbindir: XXX_EPREFIX_XXX/usr/sbin + libdir: XXX_EPREFIX_XXX/usr/lib + libexecdir: XXX_EPREFIX_XXX/usr/lib/apache2/modules + mandir: XXX_EPREFIX_XXX/usr/share/man + includedir: XXX_EPREFIX_XXX/usr/include/apache2 + installbuilddir: XXX_EPREFIX_XXX/usr/lib/apache2/build + datadir: XXX_EPREFIX_XXX/var/www/localhost + errordir: XXX_EPREFIX_XXX/var/www/localhost/error + iconsdir: XXX_EPREFIX_XXX/var/www/localhost/icons + htdocsdir: XXX_EPREFIX_XXX/var/www/localhost/htdocs + cgidir: XXX_EPREFIX_XXX/var/www/localhost/cgi-bin + manualdir: XXX_EPREFIX_XXX/usr/share/doc/version/manual + sysconfdir: XXX_EPREFIX_XXX/etc/apache2 + localstatedir: XXX_EPREFIX_XXX/var + runtimedir: XXX_EPREFIX_XXX/var/run + logfiledir: XXX_EPREFIX_XXX/var/log/apache2 + proxycachedir: XXX_EPREFIX_XXX/var/cache/apache2 diff -ur gentoo-apache-2.2.4-r11/scripts/gentestcrt.sh gentoo-apache-2.2.4-r11.patched/scripts/gentestcrt.sh --- gentoo-apache-2.2.4-r11/scripts/gentestcrt.sh 2007-06-05 07:13:46 -0400 +++ gentoo-apache-2.2.4-r11.patched/scripts/gentestcrt.sh 2007-08-05 23:43:55 -0400 @@ -6,7 +6,7 @@ ## # external tools -openssl="/usr/bin/openssl" +openssl="XXX_EPREFIX_XXX/usr/bin/openssl" # some optional terminal sequences case $TERM in