From owner-freebsd-bugs@FreeBSD.ORG  Fri Sep 14 13:10:13 2012
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EE313106566B
	for <freebsd-bugs@hub.freebsd.org>;
	Fri, 14 Sep 2012 13:10:12 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id BFF0A8FC1A
	for <freebsd-bugs@hub.freebsd.org>;
	Fri, 14 Sep 2012 13:10:12 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q8EDACks039358
	for <freebsd-bugs@freefall.freebsd.org>; Fri, 14 Sep 2012 13:10:12 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8EDACsL039344;
	Fri, 14 Sep 2012 13:10:12 GMT (envelope-from gnats)
Date: Fri, 14 Sep 2012 13:10:12 GMT
Message-Id: <201209141310.q8EDACsL039344@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
From: dfilter@FreeBSD.ORG (dfilter service)
Cc: 
Subject: Re: bin/171402: commit references a PR
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: dfilter service <dfilter@FreeBSD.ORG>
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Sep 2012 13:10:13 -0000

The following reply was made to PR bin/171402; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/171402: commit references a PR
Date: Fri, 14 Sep 2012 13:00:57 +0000 (UTC)

 Author: des
 Date: Fri Sep 14 13:00:43 2012
 New Revision: 240496
 URL: http://svn.freebsd.org/changeset/base/240496
 
 Log:
   Use libmd if and only if OpenSSL is not available.
   
   PR:		bin/171402
   MFC after:	3 days
 
 Modified:
   head/lib/libfetch/Makefile
   head/lib/libfetch/http.c
   head/usr.bin/fetch/Makefile
 
 Modified: head/lib/libfetch/Makefile
 ==============================================================================
 --- head/lib/libfetch/Makefile	Fri Sep 14 12:15:13 2012	(r240495)
 +++ head/lib/libfetch/Makefile	Fri Sep 14 13:00:43 2012	(r240496)
 @@ -16,8 +16,8 @@ CFLAGS+=	-DINET6
  
  .if ${MK_OPENSSL} != "no"
  CFLAGS+=	-DWITH_SSL
 -DPADD=		${LIBSSL} ${LIBCRYPTO} ${LIBMD}
 -LDADD=		-lssl -lcrypto -lmd
 +DPADD=		${LIBSSL} ${LIBCRYPTO}
 +LDADD=		-lssl -lcrypto
  .else
  DPADD=		${LIBMD}
  LDADD=		-lmd
 
 Modified: head/lib/libfetch/http.c
 ==============================================================================
 --- head/lib/libfetch/http.c	Fri Sep 14 12:15:13 2012	(r240495)
 +++ head/lib/libfetch/http.c	Fri Sep 14 13:00:43 2012	(r240496)
 @@ -76,7 +76,15 @@ __FBSDID("$FreeBSD$");
  #include <string.h>
  #include <time.h>
  #include <unistd.h>
 +
 +#ifdef WITH_SSL
 +#include <openssl/md5.h>
 +#define MD5Init(c) MD5_Init(c)
 +#define MD5Update(c, data, len) MD5_Update(c, data, len)
 +#define MD5Final(md, c) MD5_Final(md, c)
 +#else
  #include <md5.h>
 +#endif
  
  #include <netinet/in.h>
  #include <netinet/tcp.h>
 
 Modified: head/usr.bin/fetch/Makefile
 ==============================================================================
 --- head/usr.bin/fetch/Makefile	Fri Sep 14 12:15:13 2012	(r240495)
 +++ head/usr.bin/fetch/Makefile	Fri Sep 14 13:00:43 2012	(r240496)
 @@ -4,11 +4,12 @@
  
  PROG=		fetch
  CSTD?=		c99
 +.if ${MK_OPENSSL} != "no"
 +DPADD=		${LIBFETCH} ${LIBSSL} ${LIBCRYPTO}
 +LDADD=		-lfetch -lssl -lcrypto
 +.else
  DPADD=		${LIBFETCH} ${LIBMD}
  LDADD=		-lfetch -lmd
 -.if ${MK_OPENSSL} != "no"
 -DPADD+=		${LIBSSL} ${LIBCRYPTO}
 -LDADD+=		-lssl -lcrypto
  .endif
  
  .include <bsd.prog.mk>
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"