diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2015-05-26 17:23:35 +0300 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2015-05-26 17:23:35 +0300 |
| commit | 72f8cfc67641f352fc496312507543f7ce16e352 (patch) | |
| tree | f7ab0d3b4bf0aa4efedc7048fcb9bb5572c83405 | |
| parent | 6c96fddd7d8d387d4f60e7c308b22786927d2ee1 (diff) | |
| download | aports-72f8cfc67641f352fc496312507543f7ce16e352.tar.bz2 aports-72f8cfc67641f352fc496312507543f7ce16e352.tar.xz | |
main/apache2: remove SSLMutex directive from ssl.conf
directive no longer supported in 2.4
| -rw-r--r-- | main/apache2/APKBUILD | 8 | ||||
| -rw-r--r-- | main/apache2/ssl.conf | 5 |
2 files changed, 4 insertions, 9 deletions
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD index a8b0c79967..6ee468b50b 100644 --- a/main/apache2/APKBUILD +++ b/main/apache2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=apache2 pkgver=2.4.12 -pkgrel=1 +pkgrel=2 pkgdesc="A high performance Unix-based HTTP server" url="http://httpd.apache.org/" arch="all" @@ -224,7 +224,7 @@ e322b5211e49511cac6e40c86af1b1da apache2.confd 75fe4138b98fcffd01b8c8c077b944f3 apache2.logrotate 83c2ac51dbd0a68506902f9f6f4dfd24 apache2.initd d99af87f64688e7e62703ca27fcfe3bd httpd.conf -5d0d024ca43571b863874ab871b2c109 ssl.conf +fd2d16bda774c7a28668b0652ebc7ab8 ssl.conf b70fe826486043e3953cfe21f9e6fa16 ldap.conf fe26a0a70f572eb256a3c6c183a62223 proxy-html.conf 96eddccfca1ec0349f844e2460cf655b proxy.conf @@ -235,7 +235,7 @@ sha256sums="ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4 ht dabf43e11c941125c771d2f4f5dadd1038906420716b747dfc8f5a946a0bdad5 apache2.logrotate 2ead4e8a26f3cffae1d7b52c7662ee3edfbcc573b01f87e96af127ee0c31a3e6 apache2.initd 758f7dca0070544697247e42338fc72511eb8927055fc66e8b1b39592b236e67 httpd.conf -5c97ba711b062427682c342e233bb81a8c1b62f714ca25143e856a47f3f0c031 ssl.conf +75519a29d04e20383097477801dd6cc9bb6ca325aa514bf69081429d73b21012 ssl.conf 25771023d7c921a13c792607d47bd716c92698b20af21c018f0922eaf79a9604 ldap.conf 2511d6ea64c0f253b219670c445ed4f403f94caba5fb05e0b9600f0d107e1dda proxy-html.conf 00c42b7806eaa73e732be9d9e92c3e841b20c6d91a9920be47f19db8aee3513e proxy.conf @@ -246,7 +246,7 @@ e0a0b87889eff01e8a1ee21853d26c0307ceb87428727e60819d29644d8e54e9bfc08c197924567b 566a8c469ef148dfbb9449e91d6fb93baf85d06a31a52c283a7e402aef7bfa8b46c34ebed91c76b3e5a2cc606660145e8fc63fa41bdb22574c7efc4fc4d993e5 apache2.logrotate bb4056c9819996a41a920d53b01bd9fedcdb6227fde79d2bf7e81d96ce841c53fbd1a5550bc2d4fc3f88197ed71c4d2cc532056dfe603e32283fec9a5fc91385 apache2.initd ddbf077826ea16c9ecafea7b606adad04d5f4ce126f0d64fe677d9b6f4d81fddcd83a3f9d73c5c734ea0012e69c44c9d81bd0d4864aa4111045ab20f68cfbd13 httpd.conf -07493965ba04d29ad9bc94bf21cf9bdad74947952c61a1050f1f9ff60d8d08d6b4f9de107ca01b9c3f2764b9bc55ce0777cfaf9005dbbfa050a423b513acfda9 ssl.conf +c164caf143993d0c2a93766988a2480232b0f42731c291e56b9ddc03c9fe6e02994b9e7adfdcde1b49e2bcb43f4c90ba1e2e2af74ac3b7e1dbebd8baadc63a18 ssl.conf fbdc28ea4b94af91640794945ac4e1f45e4200e54d5bdf64c0c03fc8bdb589e444cc4f7dd0b70b696c0e5e033c8489b8bd8f8fd090906c4379651c7d032c2449 ldap.conf 263149f4a0b515e3b6d162ff282ffa90f8a448c10eb7185aec0caf75af7691b5486fa74ebe4fd46ae0ccdcf226a227705b4be4c23ed12b6d0c0aedd94a348810 proxy-html.conf aabbe171219f15efe47f8e972fc1a43f98b48977aae91b597b65bb447027992bf81757bde68b26a67e5e3b9f2e748d94b3c85d5c07433627b6048d60a51d400b proxy.conf diff --git a/main/apache2/ssl.conf b/main/apache2/ssl.conf index 8b156ebbc6..e201954a3d 100644 --- a/main/apache2/ssl.conf +++ b/main/apache2/ssl.conf @@ -37,11 +37,6 @@ SSLPassPhraseDialog builtin SSLSessionCache shmcb:/var/cache/mod_ssl/scache(512000) SSLSessionCacheTimeout 300 -# Semaphore: -# Configure the path to the mutual exclusion semaphore the -# SSL engine uses internally for inter-process synchronization. -SSLMutex default - # Pseudo Random Number Generator (PRNG): # Configure one or more sources to seed the PRNG of the # SSL library. The seed data should be of good random quality. |