diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2016-02-15 15:57:58 +0200 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2016-02-15 15:57:58 +0200 |
| commit | f77b6cf7f01c2e3110fadb824c336adc6e5c0414 (patch) | |
| tree | 704abfe6ef5155db66203d3147447dd999bbb685 /main | |
| parent | 1dac745963a3f9de0264c21eeb94349641296eaa (diff) | |
| download | aports-f77b6cf7f01c2e3110fadb824c336adc6e5c0414.tar.bz2 aports-f77b6cf7f01c2e3110fadb824c336adc6e5c0414.tar.xz | |
main/apache2: fix module paths in dav.conf, ssl.conf
Diffstat (limited to 'main')
| -rw-r--r-- | main/apache2/APKBUILD | 8 | ||||
| -rw-r--r-- | main/apache2/conf/0014-httpd-.conf-LoadModule.patch | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD index 3bcbf02dc4..b3cb2afce0 100644 --- a/main/apache2/APKBUILD +++ b/main/apache2/APKBUILD @@ -3,7 +3,7 @@ pkgname=apache2 _pkgreal=httpd pkgver=2.4.17 -pkgrel=5 +pkgrel=6 pkgdesc="A high performance Unix-based HTTP server" url="http://httpd.apache.org/" arch="all" @@ -295,7 +295,7 @@ f969c0eb55e63285e4e95bd48a475c15 0009-httpd-ssl.conf-SSL-File.patch e13a95fb3cfbd3ae1fca538eacc4b815 0011-httpd.conf-IncludeOptional.patch 5c838af084c09d6f4eea1a2b3053b4f5 0012-httpd.conf-MIMEMagicFile.patch 1e100376e89febdd8d0d65b21df38367 0013-httpd-.conf-IfModule.patch -8bff0616512e22aea2cc98b40d141553 0014-httpd-.conf-LoadModule.patch" +8a17db7a1c574621a161b14db6907c4d 0014-httpd-.conf-LoadModule.patch" sha256sums="331e035dec81d3db95b048f036f4d7b1a97ec8daa5b377bde42d4ccf1f2eb798 httpd-2.4.17.tar.bz2 6ca904ad65c1a4122d8ea4a3303ea8184429a4a4d7fb81defc30f3e184258c0a apache2.confd 8e2a8870d51796cf04cc7d8985c43e36afe9ae79e2d6765050a0e72c0de8dce7 apache2.logrotate @@ -317,7 +317,7 @@ c40668ae8384d0555488660b68eda16ad8ccb11fde16a8197d33bed739fed1e8 alpine.layout 0e3aa81eb70040f883c940090956ade949b5e420a360e07d24d95fc1662b16dd 0011-httpd.conf-IncludeOptional.patch 0904e780bbb08bb660b0a4385242f3837d35833b3305d6ea0a5dcb4c688ed3a7 0012-httpd.conf-MIMEMagicFile.patch e466a446f600831d5f46a317ac6108b812cec83320f034306f19366bd8d5a25c 0013-httpd-.conf-IfModule.patch -8111aa4fbddd21f9da2a8836b176935bcfba3e11d1067b42b8bd5001bd3bbd7f 0014-httpd-.conf-LoadModule.patch" +36cc6923cfc307db46b01c18727ded2ef05773608f4b8cb25acf913a346e99b3 0014-httpd-.conf-LoadModule.patch" sha512sums="d818dbd4b138db592a98fecdf5ae13dfadc19f9553e98bdafbdadd4693ae19bb44c96c8c279e9546978bbce55b9286ce3c4ae69cf701a9812be134a3a517b1f6 httpd-2.4.17.tar.bz2 8e62b101f90c67babe864bcb74f711656180b011df3fd4b541dc766b980b72aa409e86debf3559a55be359471c1cad81b8779ef3a55add8d368229fc7e9544fc apache2.confd 18e8859c7d99c4483792a5fd20127873aad8fa396cafbdb6f2c4253451ffe7a1093a3859ce719375e0769739c93704c88897bd087c63e1ef585e26dcc1f5dd9b apache2.logrotate @@ -339,4 +339,4 @@ d343b98f7fbdb85e3a98002a99500149249aeba0ffd89a80c542d9fb94409278d4a6b2a1c23750fc ebbb702aa0d789eb69abe0784de7d5ede651d8be2fc6eeb1be62dc337af1aa027921f324a959895b15af8c5744fb2d37e063cd659744a13d655237772c4ccf5a 0011-httpd.conf-IncludeOptional.patch f6b333723fc5fdcd8447586766762baf9e28f21f2fdecff1e10779d8c50be84408d32bad2f9d8f03083846c04967b821c44038f6fd3a57053b157e0c5c0fcce4 0012-httpd.conf-MIMEMagicFile.patch 4af68fb9330657a7b5fa24ee25176ae28603e1a6e9c642966f7f4e7817717b18597f7582a75f18f483be21f1ecc9feef7423aee0482faeef6016d6a5a957fd52 0013-httpd-.conf-IfModule.patch -b6be7576981c13f70e7532a8f6718ad4e156556932e985560e8b39ed64ee225fca3a7d4c95561c452da85722045d0049871c21f748d76837d324d9fa46aa0899 0014-httpd-.conf-LoadModule.patch" +029b90d80d945bd756c3c1b0c9b403e4e9e34a682438d542695a5d042800e36bfcad156a781b733832e90eddd87edce89e28896d3ddc680a21cb89d18e075c68 0014-httpd-.conf-LoadModule.patch" diff --git a/main/apache2/conf/0014-httpd-.conf-LoadModule.patch b/main/apache2/conf/0014-httpd-.conf-LoadModule.patch index f768a870b4..e011386795 100644 --- a/main/apache2/conf/0014-httpd-.conf-LoadModule.patch +++ b/main/apache2/conf/0014-httpd-.conf-LoadModule.patch @@ -1,4 +1,4 @@ -From d820e295733d804e863925c45558ea7d461f1fde Mon Sep 17 00:00:00 2001 +From e84023a765cff2a2c75b1176db4f7e962c2e80c8 Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> Date: Fri, 11 Sep 2015 15:12:08 +0300 Subject: [PATCH 14/14] httpd*.conf: LoadModule @@ -11,29 +11,29 @@ Subject: [PATCH 14/14] httpd*.conf: LoadModule 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/docs/conf/extra/httpd-dav.conf.in b/docs/conf/extra/httpd-dav.conf.in -index 416110b..1e225e4 100644 +index 416110b..0ddcb48 100644 --- a/docs/conf/extra/httpd-dav.conf.in +++ b/docs/conf/extra/httpd-dav.conf.in @@ -4,6 +4,9 @@ # Required modules: mod_alias, mod_auth_digest, mod_authn_core, mod_authn_file, # mod_authz_core, mod_authz_user, mod_dav, mod_dav_fs, # mod_setenvif -+LoadModule auth_digest_module lib/apache2/mod_auth_digest.so -+LoadModule dav_module lib/apache2/mod_dav.so -+LoadModule dav_fs_module lib/apache2/mod_dav_fs.so ++LoadModule auth_digest_module modules/mod_auth_digest.so ++LoadModule dav_module modules/mod_dav.so ++LoadModule dav_fs_module modules/mod_dav_fs.so # The following example gives DAV write access to a directory called # "uploads" under the ServerRoot directory. diff --git a/docs/conf/extra/httpd-ssl.conf.in b/docs/conf/extra/httpd-ssl.conf.in -index 4534852..e27070e 100644 +index 4534852..b5bcb5d 100644 --- a/docs/conf/extra/httpd-ssl.conf.in +++ b/docs/conf/extra/httpd-ssl.conf.in @@ -10,6 +10,8 @@ # # Required modules: mod_log_config, mod_setenvif, mod_ssl, # socache_shmcb_module (for default value of SSLSessionCache) -+LoadModule ssl_module lib/apache2/mod_ssl.so -+LoadModule socache_shmcb_module lib/apache2/mod_socache_shmcb.so ++LoadModule ssl_module modules/mod_ssl.so ++LoadModule socache_shmcb_module modules/mod_socache_shmcb.so # # Pseudo Random Number Generator (PRNG): |