Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/apache24/patches/config.layout.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Wed, 25 Feb 2015 02:02:14 -0800
branchs11-update
changeset 3877 d7cb5bc8ee50
permissions -rw-r--r--
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2 PSARC/2015/007 Apache FIPS 140-2 mod_ssl module 15795895 SUNBT7174116 Update Apache HTTP server to 2.4 15582360 SUNBT6871471 don't load big or infrequently-used modules that can't do anything 15806981 SUNBT7187825 Improve Apache HTTPD packaging in regards to loadable modules 15253627 SUNBT6239654 RFE: Apache2 could run with reduced privileges by default 19173368 Apache should be FIPS-140 ready
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3877
d7cb5bc8ee50 PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     1
 
Patch origin: in-house
d7cb5bc8ee50 PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     2
 
Patch status: Solaris-specific; not suitable for upstream
d7cb5bc8ee50 PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     3
 












d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




     4


--- config.layout













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




     5


+++ config.layout













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




     6


@@ -202,26 +202,26 @@













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




     7


     proxycachedir: ${localstatedir}/proxy













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




     8


 </Layout>













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




     9


 













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    10


-#   Solaris 8 Layout













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    11


+#   Solaris Layout













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    12


 <Layout Solaris>













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    13


-    prefix:        /usr/apache













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    14


+    prefix:        /usr/apache2/2.4













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    15


     exec_prefix:   ${prefix}













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    16


     bindir:        ${exec_prefix}/bin













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    17


     sbindir:       ${exec_prefix}/bin













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    18


     libdir:        ${exec_prefix}/lib













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    19


     libexecdir:    ${exec_prefix}/libexec













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    20


     mandir:        ${exec_prefix}/man













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    21


-    sysconfdir:    /etc/apache













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    22


-    datadir:       /var/apache













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    23


-    installbuilddir: ${datadir}/build













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    24


+    sysconfdir:    /etc/apache2/2.4













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    25


+    datadir:       /var/apache2/2.4













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    26


+    installbuilddir: ${prefix}/build













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    27


     errordir:      ${datadir}/error













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    28


     iconsdir:      ${datadir}/icons













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    29


     htdocsdir:     ${datadir}/htdocs













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    30


-    manualdir:     ${datadir}/manual













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    31


+    manualdir:     ${prefix}/manual













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    32


     cgidir:        ${datadir}/cgi-bin













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    33


     includedir:    ${exec_prefix}/include













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    34


     localstatedir: ${prefix}













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    35


-    runtimedir:    /var/run













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    36


+    runtimedir:    /var/run/apache2/2.4













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    37


     logfiledir:    ${datadir}/logs













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    38


     proxycachedir: ${datadir}/proxy













d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2



Petr Sumbera <petr.sumbera@oracle.com>


parents: 

diff
changeset




    39


 </Layout>















upstream/oracle/userland-gate