Date: Mon, 12 Sep 2011 01:31:36 -0500 From: Zhihao Yuan <lichray@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/160671: www/lighttpd: incomplete patch, fail to compile with openssl Message-ID: <4e6da74b.0f41650a.0f13.3381@mx.google.com> Resent-Message-ID: <201109120640.p8C6e7r3028739@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 160671 >Category: ports >Synopsis: www/lighttpd: incomplete patch, fail to compile with openssl >Confidential: no >Severity: non-critical >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Sep 12 06:40:06 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Zhihao Yuan >Release: FreeBSD 8.2-STABLE amd64 >Organization: Northern Illinois University >Environment: System: FreeBSD compaq.yuetime 8.2-STABLE FreeBSD 8.2-STABLE #8 r225370: Sun Sep 4 05:14:37 CDT 2011 lichray@compaq.yuetime:/usr/obj/home/lichray/devel/freebsd-stable/sys/HOUKAGO amd64 >Description: The patch svn 2799 is incomplete; it misses some MD5_* substitutions. >How-To-Repeat: >Fix: --- lighttpd-1.4.29_2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/www/lighttpd.orig/Makefile /usr/ports/www/lighttpd/Makefile --- /usr/ports/www/lighttpd.orig/Makefile 2011-09-09 04:55:17.000000000 -0500 +++ /usr/ports/www/lighttpd/Makefile 2011-09-12 01:14:04.922836210 -0500 @@ -7,7 +7,7 @@ PORTNAME?= lighttpd PORTVERSION= 1.4.29 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= www MASTER_SITES?= http://download.lighttpd.net/lighttpd/releases-1.4.x/ diff -ruN --exclude=CVS /usr/ports/www/lighttpd.orig/files/patch-2799-bug2331 /usr/ports/www/lighttpd/files/patch-2799-bug2331 --- /usr/ports/www/lighttpd.orig/files/patch-2799-bug2331 2011-09-09 04:55:17.000000000 -0500 +++ /usr/ports/www/lighttpd/files/patch-2799-bug2331 2011-09-12 01:13:33.942214636 -0500 @@ -387,6 +387,24 @@ CvtHex(HA1, a1); +@@ -814,13 +818,13 @@ static int http_auth_basic_password_comp + } else + /* plain md5 check now */ + { +- MD5_CTX Md5Ctx; ++ li_MD5_CTX Md5Ctx; + HASH HA1; + char a1[256]; + +- MD5_Init(&Md5Ctx); +- MD5_Update(&Md5Ctx, (unsigned char *)pw, strlen(pw)); +- MD5_Final(HA1, &Md5Ctx); ++ li_MD5_Init(&Md5Ctx); ++ li_MD5_Update(&Md5Ctx, (unsigned char *)pw, strlen(pw)); ++ li_MD5_Final(HA1, &Md5Ctx); + + CvtHex(HA1, a1); + @@ -930,7 +934,7 @@ int i; buffer *password, *b, *username_buf, *realm_buf; --- lighttpd-1.4.29_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4e6da74b.0f41650a.0f13.3381>