From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] Net-DNS: Update to 1.25 Date: Mon, 29 Jun 2020 17:45:23 +0100 Message-ID: In-Reply-To: <20200629153028.2055-1-matthias.fischer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7849901008830686269==" List-Id: --===============7849901008830686269== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Reviewed-by: Michael Tremer > On 29 Jun 2020, at 16:30, Matthias Fischer = wrote: >=20 > For details see: > https://metacpan.org/source/NLNETLABS/Net-DNS-1.25/Changes >=20 > Signed-off-by: Matthias Fischer > --- > config/rootfiles/common/Net-DNS | 187 ++++++++++++++++++++++---------- > lfs/Net-DNS | 6 +- > 2 files changed, 132 insertions(+), 61 deletions(-) >=20 > diff --git a/config/rootfiles/common/Net-DNS b/config/rootfiles/common/Net-= DNS > index f3892b6e4..5ccee9949 100644 > --- a/config/rootfiles/common/Net-DNS > +++ b/config/rootfiles/common/Net-DNS > @@ -1,101 +1,172 @@ > -#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net > -#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS.pm > -#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/F= AQ.pod > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/He= ader.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/Na= meserver.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/Pa= cket.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/Qu= estion.pm > -#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= .pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /A.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /AAAA.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /AFSDB.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /CERT.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /CNAME.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /DNAME.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /EID.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /HINFO.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /ISDN.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /LOC.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /MB.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /MG.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /MINFO.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /MR.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /MX.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /NAPTR.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /NIMLOC.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /NS.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /NSAP.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /NULL.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /OPT.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /PTR.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /PX.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /RP.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /RT.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /SOA.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /SRV.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /TKEY.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /TSIG.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /TXT.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /Unknown.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/RR= /X25.pm > -#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/R= esolver > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/Re= solver.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/Re= solver/Base.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/Re= solver/Cygwin.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/Re= solver/Recurse.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/Re= solver/UNIX.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/Re= solver/Win32.pm > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/Net/DNS/Up= date.pm > +#usr/lib/perl5/site_perl/5.30.0/Net/DNS > +usr/lib/perl5/site_perl/5.30.0/Net/DNS.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/Domain.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/DomainName.pm > +#usr/lib/perl5/site_perl/5.30.0/Net/DNS/FAQ.pod > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/Header.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/Mailbox.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/Nameserver.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/Packet.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/Parameters.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/Question.pm > +#usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/A.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/AAAA.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/AFSDB.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/AMTRELAY.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/APL.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/CAA.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/CDNSKEY.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/CDS.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/CERT.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/CNAME.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/CSYNC.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/DHCID.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/DNAME.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/DNSKEY.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/DS.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/EUI48.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/EUI64.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/GPOS.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/HINFO.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/HIP.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/IPSECKEY.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/ISDN.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/KEY.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/KX.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/L32.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/L64.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/LOC.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/LP.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/MB.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/MG.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/MINFO.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/MR.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/MX.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/NAPTR.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/NID.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/NS.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/NSEC.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/NSEC3.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/NSEC3PARAM.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/NULL.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/OPENPGPKEY.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/OPT.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/PTR.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/PX.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/RP.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/RRSIG.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/RT.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/SIG.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/SMIMEA.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/SOA.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/SPF.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/SRV.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/SSHFP.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/TKEY.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/TLSA.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/TSIG.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/TXT.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/URI.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/X25.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/ZONEMD.pm > +#usr/lib/perl5/site_perl/5.30.0/Net/DNS/Resolver > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/Resolver.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/Resolver/Base.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/Resolver/MSWin32.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/Resolver/Recurse.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/Resolver/UNIX.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/Resolver/android.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/Resolver/cygwin.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/Resolver/os2.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/Resolver/os390.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/Text.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/Update.pm > +usr/lib/perl5/site_perl/5.30.0/Net/DNS/ZoneFile.pm > #usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Net > #usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Net/D= NS > #usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Net/D= NS/.packlist > -#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Net/= DNS/DNS.bs > -usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Net/D= NS/DNS.so > #usr/share/man/man3/Net::DNS.3 > +#usr/share/man/man3/Net::DNS::Domain.3 > +#usr/share/man/man3/Net::DNS::DomainName.3 > #usr/share/man/man3/Net::DNS::FAQ.3 > #usr/share/man/man3/Net::DNS::Header.3 > +#usr/share/man/man3/Net::DNS::Mailbox.3 > #usr/share/man/man3/Net::DNS::Nameserver.3 > #usr/share/man/man3/Net::DNS::Packet.3 > +#usr/share/man/man3/Net::DNS::Parameters.3 > #usr/share/man/man3/Net::DNS::Question.3 > #usr/share/man/man3/Net::DNS::RR.3 > #usr/share/man/man3/Net::DNS::RR::A.3 > #usr/share/man/man3/Net::DNS::RR::AAAA.3 > #usr/share/man/man3/Net::DNS::RR::AFSDB.3 > +#usr/share/man/man3/Net::DNS::RR::AMTRELAY.3 > +#usr/share/man/man3/Net::DNS::RR::APL.3 > +#usr/share/man/man3/Net::DNS::RR::CAA.3 > +#usr/share/man/man3/Net::DNS::RR::CDNSKEY.3 > +#usr/share/man/man3/Net::DNS::RR::CDS.3 > #usr/share/man/man3/Net::DNS::RR::CERT.3 > #usr/share/man/man3/Net::DNS::RR::CNAME.3 > +#usr/share/man/man3/Net::DNS::RR::CSYNC.3 > +#usr/share/man/man3/Net::DNS::RR::DHCID.3 > #usr/share/man/man3/Net::DNS::RR::DNAME.3 > -#usr/share/man/man3/Net::DNS::RR::EID.3 > +#usr/share/man/man3/Net::DNS::RR::DNSKEY.3 > +#usr/share/man/man3/Net::DNS::RR::DS.3 > +#usr/share/man/man3/Net::DNS::RR::EUI48.3 > +#usr/share/man/man3/Net::DNS::RR::EUI64.3 > +#usr/share/man/man3/Net::DNS::RR::GPOS.3 > #usr/share/man/man3/Net::DNS::RR::HINFO.3 > +#usr/share/man/man3/Net::DNS::RR::HIP.3 > +#usr/share/man/man3/Net::DNS::RR::IPSECKEY.3 > #usr/share/man/man3/Net::DNS::RR::ISDN.3 > +#usr/share/man/man3/Net::DNS::RR::KEY.3 > +#usr/share/man/man3/Net::DNS::RR::KX.3 > +#usr/share/man/man3/Net::DNS::RR::L32.3 > +#usr/share/man/man3/Net::DNS::RR::L64.3 > #usr/share/man/man3/Net::DNS::RR::LOC.3 > +#usr/share/man/man3/Net::DNS::RR::LP.3 > #usr/share/man/man3/Net::DNS::RR::MB.3 > #usr/share/man/man3/Net::DNS::RR::MG.3 > #usr/share/man/man3/Net::DNS::RR::MINFO.3 > #usr/share/man/man3/Net::DNS::RR::MR.3 > #usr/share/man/man3/Net::DNS::RR::MX.3 > #usr/share/man/man3/Net::DNS::RR::NAPTR.3 > -#usr/share/man/man3/Net::DNS::RR::NIMLOC.3 > +#usr/share/man/man3/Net::DNS::RR::NID.3 > #usr/share/man/man3/Net::DNS::RR::NS.3 > -#usr/share/man/man3/Net::DNS::RR::NSAP.3 > +#usr/share/man/man3/Net::DNS::RR::NSEC.3 > +#usr/share/man/man3/Net::DNS::RR::NSEC3.3 > +#usr/share/man/man3/Net::DNS::RR::NSEC3PARAM.3 > #usr/share/man/man3/Net::DNS::RR::NULL.3 > +#usr/share/man/man3/Net::DNS::RR::OPENPGPKEY.3 > #usr/share/man/man3/Net::DNS::RR::OPT.3 > #usr/share/man/man3/Net::DNS::RR::PTR.3 > #usr/share/man/man3/Net::DNS::RR::PX.3 > #usr/share/man/man3/Net::DNS::RR::RP.3 > +#usr/share/man/man3/Net::DNS::RR::RRSIG.3 > #usr/share/man/man3/Net::DNS::RR::RT.3 > +#usr/share/man/man3/Net::DNS::RR::SIG.3 > +#usr/share/man/man3/Net::DNS::RR::SMIMEA.3 > #usr/share/man/man3/Net::DNS::RR::SOA.3 > +#usr/share/man/man3/Net::DNS::RR::SPF.3 > #usr/share/man/man3/Net::DNS::RR::SRV.3 > +#usr/share/man/man3/Net::DNS::RR::SSHFP.3 > #usr/share/man/man3/Net::DNS::RR::TKEY.3 > +#usr/share/man/man3/Net::DNS::RR::TLSA.3 > #usr/share/man/man3/Net::DNS::RR::TSIG.3 > #usr/share/man/man3/Net::DNS::RR::TXT.3 > -#usr/share/man/man3/Net::DNS::RR::Unknown.3 > +#usr/share/man/man3/Net::DNS::RR::URI.3 > #usr/share/man/man3/Net::DNS::RR::X25.3 > +#usr/share/man/man3/Net::DNS::RR::ZONEMD.3 > #usr/share/man/man3/Net::DNS::Resolver.3 > #usr/share/man/man3/Net::DNS::Resolver::Base.3 > -#usr/share/man/man3/Net::DNS::Resolver::Cygwin.3 > +#usr/share/man/man3/Net::DNS::Resolver::MSWin32.3 > #usr/share/man/man3/Net::DNS::Resolver::Recurse.3 > #usr/share/man/man3/Net::DNS::Resolver::UNIX.3 > -#usr/share/man/man3/Net::DNS::Resolver::Win32.3 > +#usr/share/man/man3/Net::DNS::Resolver::android.3 > +#usr/share/man/man3/Net::DNS::Resolver::cygwin.3 > +#usr/share/man/man3/Net::DNS::Resolver::os2.3 > +#usr/share/man/man3/Net::DNS::Resolver::os390.3 > +#usr/share/man/man3/Net::DNS::Text.3 > #usr/share/man/man3/Net::DNS::Update.3 > +#usr/share/man/man3/Net::DNS::ZoneFile.3 > diff --git a/lfs/Net-DNS b/lfs/Net-DNS > index 65e13d17d..5cdc2155d 100644 > --- a/lfs/Net-DNS > +++ b/lfs/Net-DNS > @@ -1,7 +1,7 @@ > ###########################################################################= #### > # = # > # IPFire.org - A linux based firewall = # > -# Copyright (C) 2007-2018 IPFire Team = # > +# Copyright (C) 2020 Michael Tremer & Christian Schmidt = # > # = # > # This program is free software: you can redistribute it and/or modify = # > # it under the terms of the GNU General Public License as published by = # > @@ -24,7 +24,7 @@ >=20 > include Config >=20 > -VER =3D 0.47 > +VER =3D 1.25 >=20 > THISAPP =3D Net-DNS-$(VER) > DL_FILE =3D $(THISAPP).tar.gz > @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) >=20 > $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) >=20 > -$(DL_FILE)_MD5 =3D 749a04eb4377e889ed58d004536a9117 > +$(DL_FILE)_MD5 =3D 5c0d1a6de317993e146ce6d37c897be5 >=20 > install : $(TARGET) >=20 > --=20 > 2.18.0 >=20 --===============7849901008830686269==--