[arch-commits] Commit in lighttpd/trunk (PKGBUILD openssl-0.9.8m.patch)

[Pierre Schmitz]

    Date: Wednesday, March 3, 2010 @ 07:56:36
  Author: pierre
Revision: 71035

upgpkg: lighttpd 1.4.26-2
fix openssl bug; FS#18543

Added:
  lighttpd/trunk/openssl-0.9.8m.patch
Modified:
  lighttpd/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   10 +++++++---
 openssl-0.9.8m.patch |   11 +++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-03 10:37:58 UTC (rev 71034)
+++ PKGBUILD	2010-03-03 12:56:36 UTC (rev 71035)
@@ -3,7 +3,7 @@
 
 pkgname=lighttpd
 pkgver=1.4.26
-pkgrel=1
+pkgrel=2
 pkgdesc='a secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64')
@@ -17,14 +17,18 @@
 backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
 options=('!libtool' 'emptydirs')
 source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2"
-        'lighttpd.rc.d' 'lighttpd.logrotate.d')
+        'lighttpd.rc.d' 'lighttpd.logrotate.d' 'openssl-0.9.8m.patch')
 md5sums=('a682c8efce47a2f4263a247ba0813c9b'
          '789ed1b4521e72e591e09d5dfb99235a'
-         '857e174643fd7761a2f0d8431a679f6c')
+         '857e174643fd7761a2f0d8431a679f6c'
+         '37b7ca9883d5accaae84dcd7329576ae')
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
 
+	# fixed in 1.4.27
+	patch -p0 -i ${srcdir}/openssl-0.9.8m.patch || return 1
+
 	./configure --prefix=/usr \
 		--libexecdir=/usr/lib/lighttpd/modules \
 		--sysconfdir=/etc/lighttpd \

Added: openssl-0.9.8m.patch
===================================================================
--- openssl-0.9.8m.patch	                        (rev 0)
+++ openssl-0.9.8m.patch	2010-03-03 12:56:36 UTC (rev 71035)
@@ -0,0 +1,11 @@
+--- src/network.c	(revision 2715)
++++ src/network.c	(revision 2716)
+@@ -525,7 +525,7 @@
+ 
+ 		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;