diff options
| author | René 'Necoro' Neumann <necoro@necoro.net> | 2010-03-27 00:49:42 +0100 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.net> | 2010-03-27 00:49:42 +0100 |
| commit | 5a963e5d96e8f314b06ec8d52fe0b9370e212588 (patch) | |
| tree | a83ccc0b901f4c000ffa988b36beae9cb82eb190 /www-servers | |
| parent | bba9240061dc3f8bd15bce304f0abc421024b453 (diff) | |
| download | overlay-5a963e5d96e8f314b06ec8d52fe0b9370e212588.tar.gz overlay-5a963e5d96e8f314b06ec8d52fe0b9370e212588.tar.bz2 overlay-5a963e5d96e8f314b06ec8d52fe0b9370e212588.zip | |
Fix OpenSSL issue in lighttpd
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/lighttpd/Manifest | 3 | ||||
| -rw-r--r-- | www-servers/lighttpd/files/1.4.25-fix-openssl.patch | 12 | ||||
| -rw-r--r-- | www-servers/lighttpd/lighttpd-1.4.25-r1.ebuild | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index 25b7577..bf756fe 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -1,5 +1,6 @@ AUX 1.4.25-fix-CVE-2010-0295.patch 6237 RMD160 cd9ce4410ed805d28899b0207bbc670e04491315 SHA1 2ba33d94f5628d97cb606ad97ef9630eef5191c4 SHA256 d4d269d993396cfd9146de621e0a3d5e9203ac7f6b2b6f351f9013dbbe956a4e AUX 1.4.25-fix-multiple-ssl.patch 418 RMD160 9b0b7410fa4ccb8ad874483f8bec8b69d72f80af SHA1 6e46b14b97a68b59260731b1577e531fb412f518 SHA256 0b91569695c7d6b89ce13a8deb069ee83fdcba414853401e480c1ec04760b74b +AUX 1.4.25-fix-openssl.patch 580 RMD160 98a74fc65f27766bdd378d0c57e7f00a57db9b31 SHA1 fb8fc92f8af7225a5f33839d5fe7b298aac3b532 SHA256 1f904fc7d9833099a4e4548b5a8bcef7cf4a8a08fbbb888b7fbebb27d65dd34f AUX 1.4.25-fix-unknown-AM_SILENT_RULES.patch 744 RMD160 5da8bdca1728f2de730e90de4fb7e93a274406e8 SHA1 8ae6849a88aaaca76c1b8c13a62cc266dbebc2a7 SHA256 a1cf7c77b7ee1cbe9bf3efbb7704b8582c480ae69fd70934597d24ff3fddf663 AUX 1.4.26-fix-ssl-return-check-r2716.patch 562 RMD160 81b5fc8f13e3fbca8a48fd1f954ae7e165b261b1 SHA1 60c3665d0a4f46df1da80338970c7ce6efab64fe SHA256 28391235c48d4dc686d060bbafd711e028a07b68065f40346dc40ca242f4285c AUX conf/lighttpd.conf 8243 RMD160 0b99dbb49be34521ddda14abd9b06cef141bbfc9 SHA1 8fd27dd9b5aea94ca0d1611c8fb1d9e3cb720d0b SHA256 3c016c663d14bf1cb8bf1c7d87dc0ecc1fb4f189ebd4fb05e90ed23f20439ed5 @@ -14,4 +15,4 @@ AUX lighttpd.logrotate 487 RMD160 2edb8b4abf75031af0a3b4182efb5b589dfa0d3c SHA1 AUX spawn-fcgi.confd 1076 RMD160 9468249fdedc39fa762a569622bae93f8b3481f9 SHA1 81bad945fc016275873e01e5f69838f73b275a3a SHA256 bfa452a849165f921a2febf0b06879db18c4c921f156b1452d06bb821063f768 AUX spawn-fcgi.initd 1398 RMD160 3fd0fa41d100629e85960034237abc0866ec3d38 SHA1 9c07c9fd59ec73d5f37df109b188b8a7d691f949 SHA256 ae10c764e2bde9bfc483c57ca94a63d87c24cba00b4c06917885c533d2d245b1 DIST lighttpd-1.4.25.tar.bz2 628267 RMD160 f0f7dd0ff3c92a6185be2e6017fd5ea74734c769 SHA1 bc4592930292ae8d0990a94a584f49fe8f52445b SHA256 7e803089f18b179097cb33b64b37d8a3b537ce9c196c88e3fb09881b471c88ce -EBUILD lighttpd-1.4.25-r1.ebuild 5928 RMD160 772da13605f2cb7050c0b7fb4a43207253bec46c SHA1 70324cca6496179ba50f5f7798b508210110c082 SHA256 c1d9a5d949c7b9ea72eee7735ce0140bc699461358ce4297a2301b1c7174ad69 +EBUILD lighttpd-1.4.25-r1.ebuild 5975 RMD160 5b3ae660098d22a1706e3b7701669bd8c756233f SHA1 38647420bf095067cd11a0ea3903b2916c3429f7 SHA256 ee1547f3cf8ddbba9f0c2b957893963a3d18c77bfe381ff0477a23a88e2fa0db diff --git a/www-servers/lighttpd/files/1.4.25-fix-openssl.patch b/www-servers/lighttpd/files/1.4.25-fix-openssl.patch new file mode 100644 index 0000000..712f158 --- /dev/null +++ b/www-servers/lighttpd/files/1.4.25-fix-openssl.patch @@ -0,0 +1,12 @@ +diff -purN orig/src/network.c lighttpd-1.4.25/src/network.c +--- orig/src/network.c 2010-01-28 10:43:33.829209750 -0500 ++++ lighttpd-1.4.25/src/network.c 2010-01-28 10:44:22.639208732 -0500 +@@ -525,7 +525,7 @@ int network_init(server *srv) { + + if (!s->ssl_use_sslv2) { + /* disable SSLv2 */ +- if (SSL_OP_NO_SSLv2 != SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2)) { ++ if (!(SSL_OP_NO_SSLv2 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2))) { + log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:", + ERR_error_string(ERR_get_error(), NULL)); + return -1; diff --git a/www-servers/lighttpd/lighttpd-1.4.25-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.25-r1.ebuild index f6b4c5f..e18bbeb 100644 --- a/www-servers/lighttpd/lighttpd-1.4.25-r1.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.25-r1.ebuild @@ -98,6 +98,7 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/1.4.25-fix-unknown-AM_SILENT_RULES.patch epatch "${FILESDIR}"/1.4.25-fix-CVE-2010-0295.patch + epatch "${FILESDIR}"/1.4.25-fix-openssl.patch epatch "${FILESDIR}"/1.4.25-fix-multiple-ssl.patch # dev-python/docutils installs rst2html.py not rst2html sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.am || \ |