From owner-freebsd-current@FreeBSD.ORG Wed Jun 11 10:45:59 2003 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 ED26837B401; Wed, 11 Jun 2003 10:45:59 -0700 (PDT) Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86FCD43F75; Wed, 11 Jun 2003 10:45:56 -0700 (PDT) (envelope-from ru@whale.sunbay.crimea.ua) Received: from whale.sunbay.crimea.ua (ru@localhost [127.0.0.1]) h5BHjpmV014533 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 11 Jun 2003 20:45:52 +0300 (EEST) (envelope-from ru@whale.sunbay.crimea.ua) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.12.9/8.12.8/Submit) id h5BHjpIu014528; Wed, 11 Jun 2003 20:45:51 +0300 (EEST) (envelope-from ru) Date: Wed, 11 Jun 2003 20:45:51 +0300 From: Ruslan Ermilov To: Bill Paul Message-ID: <20030611174551.GA14100@sunbay.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="eJnRUKwClWJh1Khz" Content-Disposition: inline User-Agent: Mutt/1.5.4i cc: current@FreeBSD.org Subject: Makefile.yp aka /var/yp/Makefile.dist 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: Wed, 11 Jun 2003 17:46:00 -0000 --eJnRUKwClWJh1Khz Content-Type: multipart/mixed; boundary="opJtzjQTFsWo+cga" Content-Disposition: inline --opJtzjQTFsWo+cga Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Just as a precaution, does anyone have any objections to my removing of these funny $^ sequences from Makefile.yp? They were apparently used to insert something into the map generation pipeline just before the yp_mkdb(8) invokation, but recent additions to this file did not follow this "rule". Partial patch is attached. Cheers, --=20 Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software Ltd, ru@FreeBSD.org FreeBSD committer --opJtzjQTFsWo+cga Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=p Index: Makefile.yp =================================================================== RCS file: /home/ncvs/src/usr.sbin/ypserv/Makefile.yp,v retrieving revision 1.34 diff -u -r1.34 Makefile.yp --- Makefile.yp 21 Mar 2003 11:44:03 -0000 1.34 +++ Makefile.yp 11 Jun 2003 17:40:23 -0000 @@ -235,7 +235,7 @@ ypservers: $(YPSERVERS) @echo "Updating $@..." $(CAT) $(YPSERVERS) | \ - $(AWK) '{ if ($$1 != "" && $$1 !~ "^#.*") print $$0"\t"$$0 }' $^ \ + $(AWK) '{ if ($$1 != "" && $$1 !~ "^#.*") print $$0"\t"$$0 }' \ | $(DBLOAD) -i $(YPSERVERS) -o $(YPMAPDIR)/$@ - $(TMP); \ $(RMV) $(TMP) $@ @$(DBLOAD) -c @@ -249,7 +249,7 @@ .else $(CAT) $(ETHERS) | \ $(AWK) '{ if ($$1 != "" && $$1 !~ "^#.*" && $$1 != "+") \ - print $$2"\t"$$0 }' $^ | $(DBLOAD) -i $(ETHERS) \ + print $$2"\t"$$0 }' | $(DBLOAD) -i $(ETHERS) \ -o $(YPMAPDIR)/$@ - $(TMP); $(RMV) $(TMP) $@ @$(DBLOAD) -c @if [ ! $(NOPUSH) ]; then $(YPPUSH) -d $(DOMAIN) $@; fi [...] --opJtzjQTFsWo+cga-- --eJnRUKwClWJh1Khz Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE+52rPUkv4P6juNwoRAnMzAJ9ni5lD5bRmehDbuh9ZcczVpatrYQCfQSuh +dungNXSfk6ZqJ0LD841JzA= =Mtig -----END PGP SIGNATURE----- --eJnRUKwClWJh1Khz--