main/lighttpd: security fix for CVE-2015-3200

The upstream patch does not apply without applying lot other stuff so we
simply apply all since 1.4.35 release.

ref #4329

1 files changed, 118 insertions, 1 deletions

diff --git a/main/lighttpd/APKBUILD b/main/lighttpd/APKBUILD
index b959f48f2c..e3a7d7cc12 100644
--- a/main/lighttpd/APKBUILD
+++ b/main/lighttpd/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=lighttpd
 pkgver=1.4.35
 _streamver=2.2.0
-pkgrel=3
+pkgrel=4
 pkgdesc="a secure, fast, compliant and very flexible web-server"
 url="http://www.lighttpd.net/"
 arch="all"
@@ -16,6 +16,36 @@ makedepends="flex pcre-dev openssl-dev zlib-dev bzip2-dev lua-dev
 source="http://download.lighttpd.net/lighttpd/releases-1.4.x/$pkgname-$pkgver.tar.bz2
 	http://h264.code-shop.com/download/lighttpd-1.4.18_mod_h264_streaming-$_streamver.tar.gz
 
+	0001-next-is-1.4.36.patch
+	0002-use-keep-alive-timeout-while-waiting-for-HTTP-header.patch
+	0003-fix-bad-shift-in-conditional-netmask-.-0-handling.patch
+	0004-add-more-mime-types-and-a-script-to-generate-mime.co.patch
+	0005-fix-typo-in-NEWS-entry-for-2579.patch
+	0006-add-support-for-Free-BSD-extended-attributes.patch
+	0007-build-use-fortify-flags-with-extra-warnings.patch
+	0008-mod_dirlisting-mod_redirect-mod_rewrite-abort-config.patch
+	0009-ssl-disable-SSL3.0-by-default.patch
+	0010-Fixed-typo-found-by-openSUSE-user-boo-907709.patch
+	0011-add-NEWS-entry-for-previous-commit.patch
+	0012-network-fix-compile-break-in-calculation-of-sockaddr.patch
+	0013-connections-fix-bug-in-connection-state-handling.patch
+	0014-print-backtrace-in-assert-logging-with-libunwind.patch
+	0015-fix-buffer-chunk-and-http_chunk-API.patch
+	0016-Remove-chunkqueue_get_-append-prepend-API.patch
+	0017-Remove-buffer_prepare_copy-and-buffer_prepare_append.patch
+	0018-tests-improve-valgrind-and-strace-TRACEME-disable-co.patch
+	0019-Use-buffer-API-to-read-and-modify-used-member.patch
+	0020-rename-buffer_append_long_hex-to-buffer_append_uint_.patch
+	0021-buffer-constify-some-parameters.patch
+	0022-bitset-unused-remove.patch
+	0023-remove-unused-stuff-from-server.h.patch
+	0024-crc32-fix-method-signature-const-pointer.patch
+	0025-tests-fix-undefined-index-warning-in-sendfile.php.patch
+	0026-mod_auth-use-crypt_r-instead-of-crypt-if-available.patch
+	0027-fix-error-message-for-T_CONFIG_ARRAY-config-values-i.patch
+	0028-fix-segfaults-in-many-plugins-if-they-failed-configu.patch
+	0029-escape-all-strings-for-logging-fixes-2646-log-file-i.patch
+
 	$pkgname.initd
 	$pkgname.confd
 	$pkgname.logrotate
@@ -134,6 +164,35 @@ mod_webdav() {
 
 md5sums="f7a88130ee9984b421ad8aa80629750a  lighttpd-1.4.35.tar.bz2
 ac37885c881a058194405232e7737a7a  lighttpd-1.4.18_mod_h264_streaming-2.2.0.tar.gz
+00ee47ed4f38b4feede5bc015466966f  0001-next-is-1.4.36.patch
+bd2d1fba09c4ccee295a3c2dcafe8257  0002-use-keep-alive-timeout-while-waiting-for-HTTP-header.patch
+dd6668db0b13257cbf63e6964e14edc3  0003-fix-bad-shift-in-conditional-netmask-.-0-handling.patch
+0fb4734ad0d3a669e29593a3bee8cb19  0004-add-more-mime-types-and-a-script-to-generate-mime.co.patch
+0f3bf205dfa4bc26c27e6d91bae5a77d  0005-fix-typo-in-NEWS-entry-for-2579.patch
+148470359b1c253d926929cbf4a3df6e  0006-add-support-for-Free-BSD-extended-attributes.patch
+7a295bd597977549912a995cac4c16d2  0007-build-use-fortify-flags-with-extra-warnings.patch
+f7eae7225e3bbb176c805c4781c20fdd  0008-mod_dirlisting-mod_redirect-mod_rewrite-abort-config.patch
+71745edff2b66f6e3764008f265922cf  0009-ssl-disable-SSL3.0-by-default.patch
+3dfd329eba6cbe2d5561a4a86be41d41  0010-Fixed-typo-found-by-openSUSE-user-boo-907709.patch
+d3701826b4d2e62eb915e2add340ab64  0011-add-NEWS-entry-for-previous-commit.patch
+0fb5b2d1047abf714072ac1d5e4d8e9d  0012-network-fix-compile-break-in-calculation-of-sockaddr.patch
+719ea46ccbd435b4e0a5b7679f6e6619  0013-connections-fix-bug-in-connection-state-handling.patch
+ab768bf719f1c80bcfec3921f597e9ce  0014-print-backtrace-in-assert-logging-with-libunwind.patch
+b45c3022b16bac36ed542e7761d1fc8d  0015-fix-buffer-chunk-and-http_chunk-API.patch
+4cae316e303cc74e6ceba6d9bb31b118  0016-Remove-chunkqueue_get_-append-prepend-API.patch
+5fdc9ba9824c47e92e35a87ed77cf673  0017-Remove-buffer_prepare_copy-and-buffer_prepare_append.patch
+bb6293085a26d2585fd1a9027ee163df  0018-tests-improve-valgrind-and-strace-TRACEME-disable-co.patch
+1df70c6be883619b1c0e0b225e8a76d9  0019-Use-buffer-API-to-read-and-modify-used-member.patch
+8cbc257ca7cb41933ed19bd096d63953  0020-rename-buffer_append_long_hex-to-buffer_append_uint_.patch
+abaa48bc0376b5bc2266159c81b386fd  0021-buffer-constify-some-parameters.patch
+0d2b7108b95bf4a26830e45337da57a9  0022-bitset-unused-remove.patch
+5f7c377944b94ae35e4360296241eab1  0023-remove-unused-stuff-from-server.h.patch
+7ab10c7e1f8ccb260289ab55d3588110  0024-crc32-fix-method-signature-const-pointer.patch
+ef60f4c3935b3b1a70e3ea0159208d7e  0025-tests-fix-undefined-index-warning-in-sendfile.php.patch
+24efc5f5dc32f35b34935cb69f7ff064  0026-mod_auth-use-crypt_r-instead-of-crypt-if-available.patch
+f4d7686b793434bba88c03cbbc783440  0027-fix-error-message-for-T_CONFIG_ARRAY-config-values-i.patch
+d7b916dab3c4440e0f5cee327f6e3993  0028-fix-segfaults-in-many-plugins-if-they-failed-configu.patch
+92a0c1b87737ac0f845ac10fefcf724a  0029-escape-all-strings-for-logging-fixes-2646-log-file-i.patch
 b3f7106fa5dcdadf3b0e1bb98bba5e3a  lighttpd.initd
 0dede109282bfe685bdec6b35f0e4b6b  lighttpd.confd
 ad091c9157134890499f26d170352c9f  lighttpd.logrotate
@@ -144,6 +203,35 @@ f3363e39832f1b6678468b482d121afb  mod_fastcgi.conf
 aee5947a1abf380b0685a534ca384b42  mod_fastcgi_fpm.conf"
 sha256sums="4a71c1f6d8af41ed894b507720c4c17184dc320590013881d5170ca7f15c5bf7  lighttpd-1.4.35.tar.bz2
 732cf98d823f2c7ddc96a3130a3c88d588b02ed20a0e7f8c9be25a265fbea2d6  lighttpd-1.4.18_mod_h264_streaming-2.2.0.tar.gz
+c879dbe0d41e2b5e9d79e94c621bcb6498170a9949aa9944009aebf7266f6574  0001-next-is-1.4.36.patch
+ea90697199e2dafb483942e44558bb73727b3ba2e2afe9017735a92db5a92b9e  0002-use-keep-alive-timeout-while-waiting-for-HTTP-header.patch
+2de1193ee68715de6f92654a439c09254500c6d371fd979400265af1c31e2f64  0003-fix-bad-shift-in-conditional-netmask-.-0-handling.patch
+1708a734bb0bd9a6e5ff4357da82bf5dffc15bbb89e3fb369e4ed21408431081  0004-add-more-mime-types-and-a-script-to-generate-mime.co.patch
+69b6b9986c6dd69ea77b60d61da8c984869a34d2e48928d774678392e9e0b377  0005-fix-typo-in-NEWS-entry-for-2579.patch
+959120d7c256733292aaeb6595c55e9b703968d3de3093ec3c65163f86859058  0006-add-support-for-Free-BSD-extended-attributes.patch
+e6e5984fb33ed89d7961e39ea75467a644a8f70ab931ff886545ee271b3e4079  0007-build-use-fortify-flags-with-extra-warnings.patch
+5a59ef2bf5efd77770a02421451372ec08b00a2e27cd4ce1312301ea94be58af  0008-mod_dirlisting-mod_redirect-mod_rewrite-abort-config.patch
+b204c4bf8572f41cd31d4de34529ab65ec42a0d32eb4bcd4b77d42afd3858ff5  0009-ssl-disable-SSL3.0-by-default.patch
+c25c136143f597a557df676bb80dc549d44b4216de2bbec578b02e474532b7f5  0010-Fixed-typo-found-by-openSUSE-user-boo-907709.patch
+f0759a4fd37e43abb4901ecc53cfa64bc24ffcc52d425d1057b63d5e696ccddc  0011-add-NEWS-entry-for-previous-commit.patch
+91cc0d32a195178d78923749e0d9f49cba3806e988f3ec30ec1011bb5f10c888  0012-network-fix-compile-break-in-calculation-of-sockaddr.patch
+3c1ec290a581afb0c11d5743ecdffbee4bb2caec790e9c174fce2ce7501dcc96  0013-connections-fix-bug-in-connection-state-handling.patch
+afdfe2f60b91367eecc00b63d6e7f5bad221c9d719f4f827aef2b5fd35fecdaa  0014-print-backtrace-in-assert-logging-with-libunwind.patch
+fff02538e63edb68e4c070f0c5f518a43630addd7b4ce33b321caa9071f05357  0015-fix-buffer-chunk-and-http_chunk-API.patch
+c72d9b344ba4784cb1db1d9fca4fc88c86dca25ec1cfc91688424474da22e5f9  0016-Remove-chunkqueue_get_-append-prepend-API.patch
+600a3698a6d8882bf1f91a0f1e636395736f479d3fa2dda0b0ab099dbe648e73  0017-Remove-buffer_prepare_copy-and-buffer_prepare_append.patch
+20b759bf8f4c7c79862f919fce2dc1b3348695993ba1033449df9558dbe01a6d  0018-tests-improve-valgrind-and-strace-TRACEME-disable-co.patch
+4b5538e7428ac2d625655b35f46afcdf794f9cf7fab11d2fb2f626d9c0684dd9  0019-Use-buffer-API-to-read-and-modify-used-member.patch
+17b240483cd3b326e67c6dc38b53a9041623b9aec664e883c81f4ce525a36108  0020-rename-buffer_append_long_hex-to-buffer_append_uint_.patch
+58b7afa5a8e98a700c8856174586d4f458019308313864fcddcb974cf94650b2  0021-buffer-constify-some-parameters.patch
+d98d8bc7ddd107bca0b7653a7c9ac7f6874b986864f00c4a359a71892dda9da7  0022-bitset-unused-remove.patch
+3f4524142df2db012c5a8f0ab0dac2bdc53d5a253d18b842e4ba0649e37ac435  0023-remove-unused-stuff-from-server.h.patch
+45ae49ec62907750b5741d726942bc5171397a88cf676ff7750d54a89f94e8a8  0024-crc32-fix-method-signature-const-pointer.patch
+7adefe15856cb965f6ab102d8e655513b229c475951003766ea15d60e0f95536  0025-tests-fix-undefined-index-warning-in-sendfile.php.patch
+e46917c0731eff62ee5d73ecbdd6d4276674893936132a050c855c419d1dc8e6  0026-mod_auth-use-crypt_r-instead-of-crypt-if-available.patch
+a1c8b496be35065ea72a115462c3a23c78995b953ce15b806d2ef6b6b6758523  0027-fix-error-message-for-T_CONFIG_ARRAY-config-values-i.patch
+42192c43bd917a6b196e8b3fb52cfc76b9165f0b3de08bd30d0fab08b3ce2444  0028-fix-segfaults-in-many-plugins-if-they-failed-configu.patch
+dca7509a720ce26488685ce7acca041e83e1e1f2eb195adc36338ef4031b90fc  0029-escape-all-strings-for-logging-fixes-2646-log-file-i.patch
 097a4df1a6470e2e9fd2097c7c1daa7b1ee6341faddc35a65e975af019beaebd  lighttpd.initd
 94f69a173dc26610a43532474230537b9bc31ec846fb9f94cb72765f125edf87  lighttpd.confd
 503ee1cd454e2c0f9a212ef60dc8321893eda06ccf721ecbe94d189a09e0bc6c  lighttpd.logrotate
@@ -154,6 +242,35 @@ d1adc1358b5d9e85353caa2e706bfa231d145dd59c075cdcb3f818b3cb5d722e  mod_fastcgi.co
 e7eb047360e09d1a2b693f08d4a912b99954090c5bdea706f46a33554e867043  mod_fastcgi_fpm.conf"
 sha512sums="13f8562fb735964fe7ef1b127a15c43907f34be70b6bd2dd4ba61b59275d7c2a8d9a7947ff1a4d7cc5fd7efd309fc66b7de6d954b59424f814ea2eb98fd876b9  lighttpd-1.4.35.tar.bz2
 12e1b7c8146cccfa78678ce56cd2f704423559b23b90996dff00602634f110512146386086ac234293a3c28900a06c2bec1c97e680e7eed5173372f88177b351  lighttpd-1.4.18_mod_h264_streaming-2.2.0.tar.gz
+622314eae65e08866dd55efbbf0a3c9b84818e4f5f5e4c4a602883c0123cf448edbfd1dd1c69a288fae923c730be213a4cf358aa6334caf57c62b54330fa2765  0001-next-is-1.4.36.patch
+23a9f56e402fc24cea33e2d4d84ed7c4c0473b4c28bab9837294756ea27b5f6682393871188ec9b3744591aa01c75804a3373999842f3e44935c87e7b0f214de  0002-use-keep-alive-timeout-while-waiting-for-HTTP-header.patch
+7ebe0117493bcea361e1dc60a394e57fb52b6d83c284af246179af58e41c2b2a95255f257fd8706c31dddf67559c8f807db1c959fd39777f5ec1d31bc48ed1c2  0003-fix-bad-shift-in-conditional-netmask-.-0-handling.patch
+85ad87b3632ad145812a1cf1bcaf321d98a000a0e50fdbbdbacf1b3a3e53e3081044da070ce41e2d2a234a82f4bfb7938ce09d8db289e5c469254d2b6cd6f487  0004-add-more-mime-types-and-a-script-to-generate-mime.co.patch
+64a75d212a8f4388be909d4f6b341f5567a028469b91db49df9ef018248ad78d6468d945c582090f762ea2f778568aedfb572e5493927cab25476966d11ef479  0005-fix-typo-in-NEWS-entry-for-2579.patch
+09d3722fa79423bb0bfc7c1fc5fd1b2a8022127b40b8a1055ac26aec369861b27b8be2394bfcf2dd0f33adc1063e7ba1d3bac3ced9e6d4d74c824c870aede879  0006-add-support-for-Free-BSD-extended-attributes.patch
+1df20ff4c5b48e60fdd8b4c37d47016667b7ad6c74ea8d4d8bb53b84bd0f90e9905fdc500df319a5288e92761500e8ddd6a15e5b946e34c819628bef6c501610  0007-build-use-fortify-flags-with-extra-warnings.patch
+9fb01cec49962a47db026befd73a13026df06b7ee16d4870394ce5c3dd3ff4c671b53425a1066a43482854dca7f4dad234100c0dc71e7647dc70202d61053a61  0008-mod_dirlisting-mod_redirect-mod_rewrite-abort-config.patch
+cb94bfb83ddbe1f2aaccf844ab262139f111dbc8cd522cfe3621e235b5e058fdf960d9245f154c0da17f5c52d1c2f56f37d473fdbb5c71ca584ce408ae9affca  0009-ssl-disable-SSL3.0-by-default.patch
+385db7d9879584e76ddd1e01a1d30bd8488a440ddc9ab014de5db72f001d6370007b0e96dd83f5875b154dd34ad289c7ed4d93b42c8143d81b0598dfbee38674  0010-Fixed-typo-found-by-openSUSE-user-boo-907709.patch
+3409867e77a2a7dfbd429e1ea8b5c45573c75c8574edd71fb206a3fc76a230f98b1232bfc3e7a77c59008c4c32155e360c972dd7ebcb42baf9671af2b388df2a  0011-add-NEWS-entry-for-previous-commit.patch
+cf5fbcc8742757bed684e23a8c2ca3fe66184fd5d5e153f54a24108a8ddde2062f4adb300211c56759a3401ae24c1b1e6313e8bb07e9688cc25a3fe83fae29e5  0012-network-fix-compile-break-in-calculation-of-sockaddr.patch
+836703b795bcb9601b6212c8b7e1be50a681e50697dc564749f1a5cc3795ecc16de4e86be98037b6fca98ba728835f3a5f7261e9b39e4ebe3824e3d58fcd7559  0013-connections-fix-bug-in-connection-state-handling.patch
+aca54c61898d26e6e729be421e96e595929646f4361dd905c22dc4aed6ba795c33c233f76961f2b6401ad60104c0fdfce263c1240aeeed29e3fc7bd7e7ed67a1  0014-print-backtrace-in-assert-logging-with-libunwind.patch
+d97bb6832e85923454ed3ff5c2d739c7f70b0141f08fe6c1326ca86eb55a75f5a4bf7e761b2d73402c0552bb76faefff2b442030d76891fade51197b34719839  0015-fix-buffer-chunk-and-http_chunk-API.patch
+f9a1c772a3a8cdc3d0e5dd6430d3ac5651cda2bb1f6dc156474477c6c9509ff98fcfe76bf89d9761970ccd8ae56c8585d51b81757b46ded356a55f8247efb248  0016-Remove-chunkqueue_get_-append-prepend-API.patch
+500ede5ad01476afe0e65d1cef22f0c89df3b91d330479cd23071aa594276560bf045de9531a61e5a15821ba5389e616fbdf6532caf25882d9ec86ec0c882a53  0017-Remove-buffer_prepare_copy-and-buffer_prepare_append.patch
+c22dad92b15655cb071c0e96f43bd1f6af55f1f4c468279814aa5643ec601d5e0ba5d0829470d6125a7da979fed7c79689af453e5b127310d7c5cfb77e0479ad  0018-tests-improve-valgrind-and-strace-TRACEME-disable-co.patch
+7d3133bd31cd413eef55cff57a4deeeb553db1c23cc17eb1655a0c02b70aa4f11ef069b47979966c1e0e6512a9b74a5bfcc50b4c91c55115b55d4861d3b95581  0019-Use-buffer-API-to-read-and-modify-used-member.patch
+0b37401c1acbf5b7bb633758024c2a09fe22a54731175fe5475217952691059fac1b757bf2a651c2f91ce2b71c010ad05b2015523954062cae5d88103f1eb783  0020-rename-buffer_append_long_hex-to-buffer_append_uint_.patch
+558a8333f509a3cbd7a4c04b745ab407e7d846a01fbd400e873dc9a18e90b8042bb46e34c0475dbfa203fe39ba201145d06384f5c1f42a2dc0894c43cc984dac  0021-buffer-constify-some-parameters.patch
+49c6c3d032b69740e1b9ae9f2c0b09d13a34a4e2aed890c12af78bfd2a2266319d282b0a2a63dab214189bcd9b4596226818dfca44dfed0f44d7494976f98b2c  0022-bitset-unused-remove.patch
+b1299b16f14feaf848344d27dd6b6529543d49b8ec26bf03de3e2fe7551254cc00eec1b3309f73b8e6541b730b047425feabb8f5c6a822757b7934825d79bbbc  0023-remove-unused-stuff-from-server.h.patch
+40f6436720ecf43370a32081da1529a9df1faee15e29056ec8832456beacfff2ea19e73b9c6377f1942d7852eaad2ea88cc1b4e49c0a317768f3b4a7cfb97cc1  0024-crc32-fix-method-signature-const-pointer.patch
+7c9772483e7d32cbc80dd9133661bf8a7542e2c571ecc9745d926de78f6879067cfd0feb7725235f23fa715febb5b810bcb352170cb8e6e09ce861961f937db4  0025-tests-fix-undefined-index-warning-in-sendfile.php.patch
+f01032d73b5a0f7b339fa4ea863767acf39a4ae84ab90eeac702eac029982017e659afc3da21198919c63a739412f12a31756cfa8ad1bcd8cc651cbd70d00b7d  0026-mod_auth-use-crypt_r-instead-of-crypt-if-available.patch
+bedd3fa6a02e315e11109ec0b5dd3ef2c3a8a250d45fdd673254cce20059165b1c96227725e01ac5e9b85fe93da2ac89770d5b2fe414bbf66063b5fe7d3ee38b  0027-fix-error-message-for-T_CONFIG_ARRAY-config-values-i.patch
+974ac318ad22aa164b860bf9273f0ccb10b08f43642bcd90008e31844d65329b89ff7100538971d068a1f42ea451639c5345dd94fe303a936e4ebd6212e431a6  0028-fix-segfaults-in-many-plugins-if-they-failed-configu.patch
+8fb56b604c89129ba84fd2d34dc38ea31eb07b377b69f8551c831d65d0076cfc7f0d9219bda4b0ad122e12102aecf29a84c6111a8bfc232f97652efc5f14e600  0029-escape-all-strings-for-logging-fixes-2646-log-file-i.patch
 69b7574a8d4384bcbbca587aa643aeb55c2b237e726093d1443982d8ec1d085b15c3891a273f7901a9554df4d0842a586d59cc6062b8347e72dad8c6c37bc39a  lighttpd.initd
 93a05dddab14ba6355a0345f1da2fe900c8b55fed8f98506295dc12d96c7cef803c4aca77f016b8acea7bbde485be1e09a57d31fdca6f91023fbeb4db9a90a8b  lighttpd.confd
 e1284fe9ab4b9a53c21b40a5ac3e77e66343e187321b8a2f7464db64747f3a99f7e17a9e7c0e298db84a24fa1286cfe344dbff182eddd9de5c0605f5397a6972  lighttpd.logrotate