Date: Tue, 26 Apr 2011 18:25:09 +0200 From: Pawel Jakub Dawidek <pjd@FreeBSD.org> To: Mikolaj Golub <trociny@freebsd.org> Cc: kib@FreeBSD.org, Pawel Tyll <ptyll@nitronet.pl>, freebsd-stable@freebsd.org, Jeremy Chadwick <freebsd@jdc.parodius.com>, "Matthew D. Fuller" <fullermd@over-yonder.net> Subject: Re: buildworld FAIL. Message-ID: <20110426162509.GB1979@garage.freebsd.pl> In-Reply-To: <86mxjd1h4w.fsf@in138.ua3> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110426162509.GB1979>