Petr Gajdos
02a733cd83
- modified patches
% apache2-mod_proxy_uwsgi-fix-crash.patch (refreshed)
- modified sources
% apache2-loadmodule.conf
% apache2-manual.conf
% apache2-script-helpers
% apache2@.service
% sysconfig.apache2
- deleted patches
- deprecated-scripts-arch.patch (not needed)
- httpd-2.0.54-envvars.dif (not needed)
- httpd-2.1.3alpha-layout.dif
(renamed to apache2-system-dirs-layout.patch)
- httpd-2.2.0-apxs-a2enmod.dif (not needed)
- httpd-2.4.9-bnc690734.patch
(renamed to apache2-LimitRequestFieldSize-limits-headers.patch)
- httpd-2.4.x-fate317766-config-control-two-protocol-options.diff
(renamed to apache2-HttpContentLengthHeadZero-HttpExpectStrict.patch)
- httpd-2.x.x-logresolve.patch
(renamed to apache2-logresolve-tmp-security.patch)
- httpd-apachectl.patch
(renamed to apache2-apachectl.patch)
- httpd-implicit-pointer-decl.patch (not needed)
- httpd-visibility.patch (not needed)
- deleted sources
- SUSE-NOTICE (outdated)
- a2enflag (renamed to apache2-a2enflag)
- a2enmod (renamed to apache2-a2enmod)
- apache-22-24-upgrade (outdated)
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=624
77 lines
2.7 KiB
Diff
77 lines
2.7 KiB
Diff
Index: httpd-2.4.46/config.layout
|
|
===================================================================
|
|
--- httpd-2.4.46.orig/config.layout 2020-11-11 11:02:08.957535301 +0100
|
|
+++ httpd-2.4.46/config.layout 2020-11-11 11:03:47.118083192 +0100
|
|
@@ -178,28 +178,52 @@
|
|
proxycachedir: ${localstatedir}/proxy
|
|
</Layout>
|
|
|
|
-# SuSE 6.x layout
|
|
-<Layout SuSE>
|
|
- prefix: /usr
|
|
- exec_prefix: ${prefix}
|
|
- bindir: ${prefix}/bin
|
|
- sbindir: ${prefix}/sbin
|
|
- libdir: ${prefix}/lib
|
|
- libexecdir: ${prefix}/lib/apache
|
|
- mandir: ${prefix}/share/man
|
|
- sysconfdir: /etc/httpd
|
|
- datadir: /usr/local/httpd
|
|
- installbuilddir: ${datadir}/build
|
|
- errordir: ${datadir}/error
|
|
- iconsdir: ${datadir}/icons
|
|
+# SUSE (32 bit system)
|
|
+<Layout SUSE>
|
|
+ prefix: /srv/www
|
|
+ exec_prefix: /usr
|
|
+ bindir: ${exec_prefix}/bin
|
|
+ sbindir: ${exec_prefix}/sbin
|
|
+ libdir: ${exec_prefix}/lib
|
|
+ libexecdir: ${exec_prefix}/lib/apache2${MPM_SUFFIX}
|
|
+ mandir: ${exec_prefix}/share/man
|
|
+ sysconfdir: /etc/apache2
|
|
+ datadir: ${prefix}
|
|
+ installbuilddir: ${exec_prefix}/share/apache2/build
|
|
+ errordir: ${exec_prefix}/share/apache2/error
|
|
+ iconsdir: ${exec_prefix}/share/apache2/icons
|
|
htdocsdir: ${datadir}/htdocs
|
|
- manualdir: ${datadir}/manual
|
|
+ manualdir: ${exec_prefix}/share/apache2/manual
|
|
cgidir: ${datadir}/cgi-bin
|
|
- includedir: ${prefix}/include/apache
|
|
- localstatedir: /var/lib/httpd
|
|
+ includedir: ${exec_prefix}/include/apache2${MPM_SUFFIX}
|
|
+ localstatedir: /var/lib/apache2
|
|
runtimedir: /var/run
|
|
- logfiledir: /var/log/httpd
|
|
- proxycachedir: /var/cache/httpd
|
|
+ logfiledir: /var/log/apache2
|
|
+ proxycachedir: /var/cache/apache2
|
|
+</Layout>
|
|
+
|
|
+# SUSE (64 bit system)
|
|
+<Layout SUSE_64>
|
|
+ prefix: /srv/www
|
|
+ exec_prefix: /usr
|
|
+ bindir: ${exec_prefix}/bin
|
|
+ sbindir: ${exec_prefix}/sbin
|
|
+ libdir: ${exec_prefix}/lib64
|
|
+ libexecdir: ${exec_prefix}/lib64/apache2${MPM_SUFFIX}
|
|
+ mandir: ${exec_prefix}/share/man
|
|
+ sysconfdir: /etc/apache2
|
|
+ datadir: ${prefix}
|
|
+ installbuilddir: ${exec_prefix}/share/apache2/build
|
|
+ errordir: ${exec_prefix}/share/apache2/error
|
|
+ iconsdir: ${exec_prefix}/share/apache2/icons
|
|
+ htdocsdir: ${datadir}/htdocs
|
|
+ manualdir: ${exec_prefix}/share/apache2/manual
|
|
+ cgidir: ${datadir}/cgi-bin
|
|
+ includedir: ${exec_prefix}/include/apache2${MPM_SUFFIX}
|
|
+ localstatedir: /var/lib/apache2
|
|
+ runtimedir: /var/run
|
|
+ logfiledir: /var/log/apache2
|
|
+ proxycachedir: /var/cache/apache2
|
|
</Layout>
|
|
|
|
# BSD/OS layout
|