diff options
| author | Paul Wisehart <wise@lupulin.net> | 2010-03-03 14:22:33 -0600 |
|---|---|---|
| committer | Erik Hanson <erik@slackbuilds.org> | 2010-05-13 13:24:27 +0200 |
| commit | 8378f987c75193dfed04b5ec0a0f876bbaccda36 (patch) | |
| tree | 0846f063d02faaa4d36869c6fb893091abdbc16e | |
| parent | 801302e3f2cb48cf6ae741ee5d3128f3f3d4d8eb (diff) | |
network/lighttpd: Updated for version 1.4.26.
| -rw-r--r-- | network/lighttpd/08-ssl-retval-fix.patch | 12 | ||||
| -rw-r--r-- | network/lighttpd/lighttpd.SlackBuild | 5 | ||||
| -rw-r--r-- | network/lighttpd/lighttpd.info | 8 |
3 files changed, 20 insertions, 5 deletions
diff --git a/network/lighttpd/08-ssl-retval-fix.patch b/network/lighttpd/08-ssl-retval-fix.patch new file mode 100644 index 0000000000000..712f158a233ab --- /dev/null +++ b/network/lighttpd/08-ssl-retval-fix.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/network/lighttpd/lighttpd.SlackBuild b/network/lighttpd/lighttpd.SlackBuild index 7cd2044b60b4e..d2246c7349564 100644 --- a/network/lighttpd/lighttpd.SlackBuild +++ b/network/lighttpd/lighttpd.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=lighttpd -VERSION=1.4.25 +VERSION=1.4.26 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -75,6 +75,9 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . +# apply ssl related bug fix (rm in 1.4.27) +patch -p1 < ${CWD}/08-ssl-retval-fix.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/lighttpd/lighttpd.info b/network/lighttpd/lighttpd.info index b9dfe27544f4e..1cdfe69b0e643 100644 --- a/network/lighttpd/lighttpd.info +++ b/network/lighttpd/lighttpd.info @@ -1,10 +1,10 @@ PRGNAM="lighttpd" -VERSION="1.4.25" +VERSION="1.4.26" HOMEPAGE="http://www.lighttpd.net/" -DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.25.tar.bz2" -MD5SUM="2027c49fb46530e45338c5e2da13c02f" +DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.26.tar.bz2" +MD5SUM="a682c8efce47a2f4263a247ba0813c9b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="paul wisehart" EMAIL="wise@lupulin.net" -APPROVED="rworkman" +APPROVED="Erik Hanson" |