From owner-svn-src-all@FreeBSD.ORG  Fri Sep 14 15:08:44 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B79EA1065670;
	Fri, 14 Sep 2012 15:08:44 +0000 (UTC)
	(envelope-from bapt@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 99FB18FC15;
	Fri, 14 Sep 2012 15:08:44 +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 q8EF8iew091493;
	Fri, 14 Sep 2012 15:08:44 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
	by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8EF8ihV091450;
	Fri, 14 Sep 2012 15:08:44 GMT (envelope-from bapt@FreeBSD.org)
X-Authentication-Warning: freefall.freebsd.org: bapt set sender to
	bapt@FreeBSD.org using -f
Date: Fri, 14 Sep 2012 17:08:41 +0200
From: Baptiste Daroussin <bapt@FreeBSD.org>
To: Dag-Erling =?utf-8?Q?Sm=EF=BF=BDrgrav?= <des@FreeBSD.org>
Message-ID: <20120914150841.GG68582@ithaqua.etoilebsd.net>
References: <201209141300.q8ED0hI1026210@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="df+09Je9rNq3P+GE"
Content-Disposition: inline
In-Reply-To: <201209141300.q8ED0hI1026210@svn.freebsd.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
	src-committers@FreeBSD.org
Subject: Re: svn commit: r240496 - in head: lib/libfetch usr.bin/fetch
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Sep 2012 15:08:44 -0000


--df+09Je9rNq3P+GE
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Fri, Sep 14, 2012 at 01:00:43PM +0000, Dag-Erling Sm=EF=BF=BDrgrav wrote:
> Author: des
> Date: Fri Sep 14 13:00:43 2012
> New Revision: 240496
> URL: http://svn.freebsd.org/changeset/base/240496
>=20
> Log:
>   Use libmd if and only if OpenSSL is not available.
>  =20
>   PR:		bin/171402
>   MFC after:	3 days
>=20
> Modified:
>   head/lib/libfetch/Makefile
>   head/lib/libfetch/http.c
>   head/usr.bin/fetch/Makefile
>=20
> Modified: head/lib/libfetch/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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+=3D	-DINET6
> =20
>  .if ${MK_OPENSSL} !=3D "no"
>  CFLAGS+=3D	-DWITH_SSL
> -DPADD=3D		${LIBSSL} ${LIBCRYPTO} ${LIBMD}
> -LDADD=3D		-lssl -lcrypto -lmd
> +DPADD=3D		${LIBSSL} ${LIBCRYPTO}
> +LDADD=3D		-lssl -lcrypto
>  .else
>  DPADD=3D		${LIBMD}
>  LDADD=3D		-lmd
>=20
> Modified: head/lib/libfetch/http.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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
> =20
>  #include <netinet/in.h>
>  #include <netinet/tcp.h>
>=20
> Modified: head/usr.bin/fetch/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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 @@
> =20
>  PROG=3D		fetch
>  CSTD?=3D		c99
> +.if ${MK_OPENSSL} !=3D "no"
> +DPADD=3D		${LIBFETCH} ${LIBSSL} ${LIBCRYPTO}
> +LDADD=3D		-lfetch -lssl -lcrypto
> +.else
>  DPADD=3D		${LIBFETCH} ${LIBMD}
>  LDADD=3D		-lfetch -lmd
> -.if ${MK_OPENSSL} !=3D "no"
> -DPADD+=3D		${LIBSSL} ${LIBCRYPTO}
> -LDADD+=3D		-lssl -lcrypto
>  .endif
> =20
>  .include <bsd.prog.mk>

Do you plan to push it to 9.1, that will help having pkgng linked against l=
ibmd.

regards,
Bapt

--df+09Je9rNq3P+GE
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iEYEARECAAYFAlBTSHkACgkQ8kTtMUmk6EzL7wCgnTzVFoDAMCqSOwhlP7QFBT5l
nsIAn3+Vz55QDzWqcRTDLecStxNRm0Bo
=zWCz
-----END PGP SIGNATURE-----

--df+09Je9rNq3P+GE--