From owner-freebsd-stable@FreeBSD.ORG Tue Apr 26 16:25:27 2011 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D6D091065670; Tue, 26 Apr 2011 16:25:27 +0000 (UTC) (envelope-from pawel@dawidek.net) Received: from mail.garage.freebsd.pl (60.wheelsystems.com [83.12.187.60]) by mx1.freebsd.org (Postfix) with ESMTP id 782D08FC13; Tue, 26 Apr 2011 16:25:27 +0000 (UTC) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id 1B24645EA4; Tue, 26 Apr 2011 18:25:22 +0200 (CEST) Received: from localhost (89-73-195-149.dynamic.chello.pl [89.73.195.149]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id EB6E045E87; Tue, 26 Apr 2011 18:25:16 +0200 (CEST) Date: Tue, 26 Apr 2011 18:25:09 +0200 From: Pawel Jakub Dawidek To: Mikolaj Golub Message-ID: <20110426162509.GB1979@garage.freebsd.pl> References: <926783796.20110423022501@nitronet.pl> <20110423005422.GQ91591@over-yonder.net> <2910134705.20110423090442@nitronet.pl> <20110423125247.GA89102@icarus.home.lan> <20110423143838.GR91591@over-yonder.net> <86mxjd1h4w.fsf@in138.ua3> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="kORqDWCi7qDJ0mEj" Content-Disposition: inline In-Reply-To: <86mxjd1h4w.fsf@in138.ua3> X-OS: FreeBSD 9.0-CURRENT amd64 User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-0.6 required=4.5 tests=BAYES_00,RCVD_IN_SORBS_DUL autolearn=no version=3.0.4 Cc: kib@FreeBSD.org, Pawel Tyll , freebsd-stable@freebsd.org, Jeremy Chadwick , "Matthew D. Fuller" Subject: Re: buildworld FAIL. X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2011 16:25:27 -0000 --kORqDWCi7qDJ0mEj Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Apr 26, 2011 at 12:44:31PM +0300, Mikolaj Golub wrote: >=20 > On Sat, 23 Apr 2011 09:38:39 -0500 Matthew D. Fuller wrote: >=20 > MDF> On Sat, Apr 23, 2011 at 05:52:47AM -0700 I heard the voice of > MDF> Jeremy Chadwick, and lo! it spake thus: > >> On Sat, Apr 23, 2011 at 09:04:42AM +0200, Pawel Tyll wrote: > >> > So was NO_OPENSSL deprecated or something? > >>=20 > >> I think he's implying that hast indirectly relies upon OpenSSL. >=20 > MDF> There's some conditionalization on MK_OPENSSL in the Makefile (and = via > MDF> that, in the code), but it's incomplete. Whether that means it > MDF> _should_ be buildable without OpenSSL and is just insufficiently > MDF> tested, or whether it really just flat needs OpenSSL and the > MDF> conditionalization is vestigial, I don't know. pjd@ cc'd. >=20 > The attached patch should fix this. The patch looks good. Please commit. > Index: sbin/hastd/hast_proto.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 > --- sbin/hastd/hast_proto.c (revision 221054) > +++ sbin/hastd/hast_proto.c (working copy) > @@ -69,7 +69,9 @@ struct hast_pipe_stage { > =20 > static struct hast_pipe_stage pipeline[] =3D { > { "compression", compression_send, compression_recv }, > +#ifdef HAVE_CRYPTO > { "checksum", checksum_send, checksum_recv } > +#endif > }; > =20 > /* --=20 Pawel Jakub Dawidek http://www.wheelsystems.com FreeBSD committer http://www.FreeBSD.org Am I Evil? Yes, I Am! http://yomoli.com --kORqDWCi7qDJ0mEj Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAk228eUACgkQForvXbEpPzSiSgCgm3Q1D1N9WWBpzplkuYuw3W9C AfMAoL+Duq19gAyFBSU7QTJ2hbxQZ14e =ruPZ -----END PGP SIGNATURE----- --kORqDWCi7qDJ0mEj--