From owner-freebsd-current@FreeBSD.ORG Tue Apr 13 04:17:41 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0632716A4CE for ; Tue, 13 Apr 2004 04:17:41 -0700 (PDT) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10EC543D1F for ; Tue, 13 Apr 2004 04:17:40 -0700 (PDT) (envelope-from ru@ip.net.ua) Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id i3DBMFR4069806 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Apr 2004 14:22:17 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.12.11/8.12.11) id i3DBHKMp044021; Tue, 13 Apr 2004 14:17:20 +0300 (EEST) (envelope-from ru) Date: Tue, 13 Apr 2004 14:17:19 +0300 From: Ruslan Ermilov To: Michael Bretterklieber Message-ID: <20040413111719.GA43932@ip.net.ua> References: <20040413075342.GF35262@ip.net.ua> <407BC2DB.6000407@a-quadrat.at> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="BOKacYhQ+x31HxR3" Content-Disposition: inline In-Reply-To: <407BC2DB.6000407@a-quadrat.at> User-Agent: Mutt/1.5.6i X-Virus-Scanned: by amavisd-new X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: current@freebsd.org Subject: Re: libradius patches (fwd) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Apr 2004 11:17:41 -0000 --BOKacYhQ+x31HxR3 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Apr 13, 2004 at 12:37:15PM +0200, Michael Bretterklieber wrote: > Hi Ruslan, >=20 > Ruslan Ermilov schrieb: > > > >I don't have a test environment for Radius, but the Makefile.inc1 > >patch is wrong, and shouldn't be committed as is. If a different > >library build order is necessary for prebuilt libs (as should be > >verified by running the src/tools/make_libdeps.sh script with the > >patches), then only some modifications should be made to the __L > >lines in Makefile.inc1, again as reported by this tool. > > > after modifying make_libdeps.sh: > --- make_libdeps.sh_orig Tue Apr 13 10:15:19 2004 > +++ make_libdeps.sh Tue Apr 13 10:15:49 2004 > @@ -52,6 +52,7 @@ > -e's;-l(asn1|gssapi|krb5|roken)!;kerberos5/lib/lib\1;g' > -e's;-l(crypto|ssh)!;secure/lib/lib\1;g' > -e's;-l([^!]+)!;lib/lib\1;g' > + -e's;-lssl!;secure/lib/libssl;g' > " >=20 > # Generate interdependencies between libraries. >=20 > it prints out: > ... > List of interdependencies: >=20 > lib/libopie lib/libtacplus: lib/libmd > lib/libradius: lib/libssl > lib/libypclnt: lib/librpcsvc > secure/lib/libssh: secure/lib/libcrypto lib/libz >=20 I've committed your change to make_libdeps.sh, slightly different but functionally equivalent. Thanks! > how does that patch look for you, better? >=20 Yes, now it looks correct (except for adding an extraneous empty line at the end). > --- Makefile.inc1.orig Tue Mar 23 14:47:17 2004 > +++ Makefile.inc1 Tue Apr 13 10:57:59 2004 [...] > @@ -833,6 +834,11 @@ > .endif > _generic_libs+=3D secure/lib > .endif > + > +.if defined(NOCRYPT) || defined(NO_OPENSSL) > +lib/libradius__L: lib/libmd__L > +.endif > + >=20 > _generic_libs+=3D usr.bin/lex/lib >=20 > I made successfully two complete buildworld's with and without NO_OPENSSL. >=20 Good. Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --BOKacYhQ+x31HxR3 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFAe8w/Ukv4P6juNwoRAsEOAJ9HdxOjrfhkAdkBZjx9rwXlEAEs1ACff0KY tgjK2za52JTpdkFSy5Xzx/U= =NbQj -----END PGP SIGNATURE----- --BOKacYhQ+x31HxR3--