Module Name:    othersrc
Committed By:   agc
Date:           Wed Jan 17 01:38:37 UTC 2018

Modified Files:
        othersrc/external/historical/eawk/bin: expected
        othersrc/external/historical/eawk/dist: awkgram.y
        othersrc/external/historical/eawk/extend: Makefile
        othersrc/external/historical/eawk/extend/archive: archive.c
        othersrc/external/historical/eawk/extend/netpgpverify: netpgpverify.c
        othersrc/external/historical/eawk/lib: Makefile

Log Message:
Bring eawk up to date, it's had no real love since 2013.

1. Don't use bison, just use standard yacc to build
2. Use pure-parser directive, rather than %pure_parser
3. libarchive has changed its API since 2013 - adapt
4. netpgpverify has also changed its API since 2013 - adapt also
5. There is no sqlite3 sub-directory, so don't descend into it

With thanks to yukonbob for the nudge.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 othersrc/external/historical/eawk/bin/expected
cvs rdiff -u -r1.3 -r1.4 othersrc/external/historical/eawk/dist/awkgram.y
cvs rdiff -u -r1.5 -r1.6 othersrc/external/historical/eawk/extend/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    othersrc/external/historical/eawk/extend/archive/archive.c
cvs rdiff -u -r1.1 -r1.2 \
    othersrc/external/historical/eawk/extend/netpgpverify/netpgpverify.c
cvs rdiff -u -r1.1 -r1.2 othersrc/external/historical/eawk/lib/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/external/historical/eawk/bin/expected
diff -u othersrc/external/historical/eawk/bin/expected:1.4 othersrc/external/historical/eawk/bin/expected:1.5
--- othersrc/external/historical/eawk/bin/expected:1.4	Thu Jun  6 01:45:56 2013
+++ othersrc/external/historical/eawk/bin/expected	Wed Jan 17 01:38:36 2018
@@ -20,23 +20,14 @@ _mdnsd
 _tests
 _tcpdump
 _tss
+_rtadvd
+_unbound
 uucp
 nobody
 agc
-prosody
-quagga
-cjparker
-dirmngr
 dbus
 lp
-avahi
-polkit
-haldaemon
-pulse
 cyrus
-distcc
-varnish
-stud
 2. Testing FS, non-first field, print and next
 root:Charlie &
 toor:Bourne-again Superuser
@@ -58,23 +49,14 @@ _mdnsd:& pseudo-user
 _tests:& pseudo-user
 _tcpdump:& pseudo-user
 _tss:& pseudo-user
+_rtadvd:& pseudo-user
+_unbound:& pseudo-user
 uucp:UNIX-to-UNIX Copy
 nobody:Unprivileged user
 agc:
-prosody:Prosody daemon user
-quagga:quagga user
-cjparker:
-dirmngr:dirmngr user
 dbus:System message bus
 lp:Common UNIX Printing System user
-avahi:Avahi user
-polkit:policykit polkit user
-haldaemon:hal haldaemon user
-pulse:pulseaudio pulse user
 cyrus:cyrus-sasl cyrus user
-distcc:distcc user
-varnish:Varnish daemon user
-stud:stud daemon user
 3. Testing BEGIN printing
 hello world
 4. Testing bit arith
@@ -114,7 +96,7 @@ ddaf35a193617abacc417349ae20413112e6fa4e
 15. Testing stat
 mode 100644
 16. Testing stat
-mode 2123
+mode 1576
 16. Testing time
 17. Testing ctime
 wrong ctime!
@@ -130,9 +112,9 @@ WARNS=		5
 21. Testing getaddrinfo
 17
 21. Testing getaddrinfo address returned
-10020050951435560000000000000000
+10020050c7e9d9cd0000000000000000
 22. Testing getaddrinfo address returned
-10020050951435560000000000000000
+10020050c7e9d9cd0000000000000000
 23. Testing soundex
 abortion a163 BRXN
 acrimony a265 KRMNY
@@ -199,550 +181,11 @@ output
 27. Testing fnmatch
 Makefile
 28. Testing http
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-	"http://www.w3.org/TR/html4/loose.dtd";>
-
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <!-- Copyright (c) 1994-2011
-	 The NetBSD Foundation, Inc.  ALL RIGHTS RESERVED. -->
-    <link rev="made" href="mailto:w...@netbsd.org">
-    <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon">
-    <link rel="stylesheet" href="global.css" type="text/css">
-    <link rel="alternate" type="application/rss+xml" title="NetBSD news"
-	  href="http://www.NetBSD.org/changes/rss-netbsd.xml";>
-    <title>The NetBSD Project</title>
-    <meta name="DESCRIPTION" content="PowerPC, Alpha, SPARC, MIPS, SH3, ARM, amd64, i386, m68k, VAX: Of course it runs NetBSD.">
-    <meta name="KEYWORDS" content="NetBSD, BSD, 4.4BSD, UNIX, acorn26, acorn32, algor, algorithmics, alpha, amiga, amigappc, arc, arm26, arm32, atari, bebox, cats, cesfic, cobalt, evbarm, evbmips, evbppc, evbsh3, ews4800, hp300, hp700, hpcarm, hpcmips, hpcsh, hppa, i386, ibmnws, iyonix, luna68k, m68k, mac68k, macppc, mips, mmeye, mvme68k, mvmeppc, netwinder, news68k, newsmips, next68k, mipsco, ofppc, pica, pmax, pmppc, prep, powerpc, sandpoint, sbmips, sgimips, sh3, shark, sparc, sparc64, sun2, sun3, sun3x, ultrasparc, vax, walnut, x68k, x86-64, amd64, xen, linux, freebsd, hp-ux, sunos, osf/1, ultrix, svr4, solaris, sco, iBCS2, IPv6, embedded, real-time, open source, opteron, open source">
-    <meta name="verify-v1" content="guJT5SZUh4XMF/emgSnXZPc6GkWkhP7PvMdYBc/auJI=">
-
-    <script type="text/javascript" src="global.js"></script>
-
-    <script type="text/javascript">
-    <!--
-    /* pseudo class: platinum donor */
-    function Donor(URL, Img) {
-	    this.URL = URL;
-	    this.Img = Img;
-    }
-
-    var now = new Date();
-
-    var dindex;
-    var di = 0;
-    var donors = new Array();
-    // -->
-    </script>
-    <!-- donors data -->
-    <script type="text/javascript" src="donations/donors.js"></script>
-  </head>
-
-  <body class="website"><div class="webpage">
-    <!-- For non-visual user agents: -->
-    <div id="top"><a href="#mainContent" class="doNotDisplay doNotPrint">Skip to main content.</a></div>
-
-    <div id="centralHeader">
-	<div id="logo">
-		<a href="./"><img src="images/NetBSD-smaller.png" alt="[NetBSD Logo]"/></a>
-		<div id="name"><a href="./">The NetBSD Project</a></div>
-		<div id="slogan"><a href="./">&ldquo;Of course it runs NetBSD&rdquo;</a></div>
-	</div>
-	<div id="headerTools">
-	    <form id="headerMirrors" method="get" action="http://www.NetBSD.org/cgi-bin/redirect.cgi";>
-	      <select name="location" onchange="submit();">
-		<option value="http://www.NetBSD.org/";>- WWW mirrors -</option>
-		<!-- this part automatically generated from mirrors.db through
-		     some Makefile-magic -->
-		<!-- MIRRORS::START -->
-		<option value="http://www.au.NetBSD.org/";>Australia</option>
-		<option value="http://www2.be.NetBSD.org/";>Belgium (IPv4,IPv6)</option>
-		<option value="http://www.fr.NetBSD.org/";>France (IPv4,IPv6)</option>
-		<option value="http://netbsd.mcom.fr/";>France/2</option>
-		<option value="http://www.de.NetBSD.org/";>Germany (IPv4,IPv6)</option>
-		<option value="http://netbsd.mirrors.treibsand.com/";>Germany/2</option>
-		<option value="http://www.it.NetBSD.org/";>Italy</option>
-		<option value="http://www.jp.NetBSD.org/index.html";>Japan</option>
-		<option value="http://www.za.NetBSD.org/";>South Africa</option>
-		<option value="http://www.se.NetBSD.org/";>Sweden</option>
-		<option value="http://www.uk.NetBSD.org/";>UK</option>
-		<option value="http://netbsd.planetunix.net/";>USA (IPv4,IPv6)</option>
-		<!-- MIRRORS::END -->
-		<option value="http://www.NetBSD.org/";>Master Site, USA (IPv4, IPv6)</option>
-		<option value="http://www6.NetBSD.org/";>Master Site, USA (IPv6 only)</option>
-	      </select>
-	      <input type="submit" value=" Go "/>
-	    </form>
-
-	 <!--  <div id="headerLangs"> -->
-<!-- 	    <a href="http://jp.NetBSD.org/";>jp</a> | -->
-<!-- 	    <a href="./lt/">lt</a> -->
-<!--      <a href="./">en</a> | -->
-<!--      <a href="./ko/">sv</a> | -->
-<!-- 	  </div> -->
-
-	<div id="header-cse-search-form">Google custom search</div>
-	<script src="http://www.google.com/jsapi"; type="text/javascript"></script><script type="text/javascript"> 
-	google.load('search', '1', {language : 'en'});
-	google.setOnLoadCallback(function() {
-		var header_customSearchControl = new google.search.CustomSearchControl('006277936787196004968:mbdhrauy1wm');
-		header_customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
-		var header_options = new google.search.DrawOptions();
-		header_options.enableSearchboxOnly("http://google.com/cse?cx=006277936787196004968:mbdhrauy1wm";);    
-		header_customSearchControl.draw('header-cse-search-form', header_options);
-	}, true);
-	</script>
-	</div>
-      </div>
-
-      <div id="navBar" role="navigation">
-	<span class="doNotDisplay">
-          Navigation:
-        </span>
-	<ul>
-	<li><a href="./">
-		  Home</a></li>
-	<li>
-	<a href="./">
-		  News &amp; Media</a><ul>
-	<li><a href="./changes/">
-		    Recent changes</a></li>
-	<li><a href="http://blog.NetBSD.org/";>
-		    NetBSD blog</a></li>
-	<li><a href="./gallery/events.html">
-		    Events</a></li>
-	<li><a href="./changes/rss.html">
-		    Feeds</a></li>
-	</ul>
-	</li>
-	<li>
-	<a href="./about/">
-		  About</a><ul>
-	<li><a href="./about/">
-		    NetBSD</a></li>
-	<li><a href="./foundation/">
-		    The NetBSD Foundation</a></li>
-	<li><a href="./gallery/">
-		    Advocacy</a></li>
-	</ul>
-	</li>
-	<li>
-	<a href="./docs/">
-		  Documentation</a><ul>
-	<li><a href="./docs/misc/index.html">
-		    FAQ &amp; HOWTOs</a></li>
-	<li><a href="./docs/guide/en/">
-		    The Guide</a></li>
-	<li><a href="http://man.NetBSD.org/";>
-		    Manual pages</a></li>
-	<li><a href="http://wiki.NetBSD.org/";>
-		    Wiki</a></li>
-	</ul>
-	</li>
-	<li>
-	<a href="./support/">
-		  Support</a><ul>
-	<li><a href="./support/send-pr.html">
-		    Problem report guide</a></li>
-	<li><a href="./cgi-bin/sendpr.cgi?gndb=netbsd">
-		    Report a bug</a></li>
-	<li><a href="./support/query-pr.html">
-		    Query bug database</a></li>
-	<li><a href="./support/security/">
-		    Security</a></li>
-	</ul>
-	</li>
-	<li>
-	<a href="./community/">
-		  Community</a><ul>
-	<li><a href="http://onetbsd.org/";>
-		    Blogs</a></li>
-	<li><a href="./mailinglists/">
-		    Mailing lists</a></li>
-	<li><a href="http://mail-index.NetBSD.org/";>
-		    List archives</a></li>
-	</ul>
-	</li>
-	<li>
-	<a href="./developers/">
-		  Developers</a><ul>
-	<li><a href="http://cvsweb.NetBSD.org/";>
-		    Browse source</a></li>
-	<li><a href="http://nxr.NetBSD.org/";>
-		    Cross-reference</a></li>
-	<li><a href="http://releng.NetBSD.org/";>
-		    Release engineering</a></li>
-	<li><a href="http://wiki.NetBSD.org/projects/";>
-		    Projects list</a></li>
-	</ul>
-	</li>
-	<li>
-	<a href="./ports/">
-		  Ports</a><ul>
-	<li><a href="./ports/history.html">
-		    History</a></li>
-	<li><a href="./ports/emulators.html">
-		    Emulators</a></li>
-	</ul>
-	</li>
-	<li>
-	<a href="http://www.pkgsrc.org/";>
-		Packages</a><ul>
-	<li><a href="http://www.pkgsrc.se/";>
-		    Browse packages</a></li>
-	<li><a href="http://releng.NetBSD.org/index-pkgsrc.html";>
-		    Release engineering</a></li>
-	</ul>
-	</li>
-	</ul>
-      </div>
-
-    <div id="content">
-      <div class="rowOfBoxes">
-	<div class="quarter noBorderOnLeft BorderOnRight sideBarLeft">
-	  <div class="iconsLeft">
-	    <a href="releases/"><img src="images/download-icon-orange.png"
-	    alt="[Get NetBSD Icon]" width="40" height="40"/>
-	    </a>
-	    <h3><span class="greylink"><a href="releases/">Get NetBSD</a></span></h3>
-	    <p>
-	      <a href="releases/index.html#formal">Download NetBSD&nbsp;6.1</a>
-	      now from one of our <a href="mirrors/">mirrors</a>, or
-	      obtain a copy <a href="sites/cdroms.html">on CD</a>.
-	    </p>
-	    <a href="support/"><img src="images/support-icon-orange.png"
-	    alt="[Get Support Icon]" width="40" height="40"/>
-	    </a>
-	    <h3><span class="greylink"><a href="support/">Get Support</a></span></h3>
-	    <p>
-	      Browse the <a href="docs/">documentation</a>, get community
-	      <a href="support/">support</a>, hire a <a
-	      href="gallery/consultants.html">consultant</a>, or check
-	      out latest <a href="support/security/">security</a> information.
-	    </p>
-
-
-	    <a href="community/"><img src="images/community-icon-orange.png"
-	    alt="[Get Involved Icon]" width="40" height="40"/>
-	    </a>
-	    <h3><span class="greylink"><a href="community/">Tune in</a></span></h3>
-	    <p>
-	      Get in contact with other NetBSD users
-	      and <a href="community/">share</a> your experience and
-	      technical knowledge.
-	    </p>
-	    <a href="contrib/"><img src="images/develop-icon-orange.png"
-	    alt="[Get Developing Icon]" width="40" height="40"/>
-	    </a>
-	    <h3><span class="greylink"><a href="contrib/">Contribute</a></span></h3>
-	    <p>
-	      Get started <a href="contrib/">contributing</a> and help
-	      to improve NetBSD even more.
-	    </p>
-	  </div>
-	  <div class="buttons">
-	    <a href="gallery/devotionalia.html">
-	      <img border="0" src="images/links/cafepress.png" alt="[Cafepress]"/>
-	    </a>
-	    <form action="https://checkout.google.com/cws/v2/Donations/150990749831378/checkoutForm";
-		id="donateGoogle" method="post" name="BB_BuyButtonForm"
-		onSubmit="return validateAmount(this.item_price_1)">
-	      <input name="item_name_1" type="hidden" value="Donation for The NetBSD Foundation, Inc."/>
-	      <input name="item_description_1" type="hidden" value="Help improve the NetBSD operating system."/>
-	      <input name="item_quantity_1" type="hidden" value="1"/>
-	      <input name="item_currency_1" type="hidden" value="USD"/>
-	      <input name="item_is_modifiable_1" type="hidden" value="true"/>
-	      <input name="item_min_price_1" type="hidden" value="10.0"/>
-	      <input name="item_max_price_1" type="hidden" value="25000.0"/>
-	      <input name="_charset_" type="hidden" value="utf-8"/>
-	      $<input id="item_price_1" name="item_price_1"
-		onfocus="this.style.color='black'; this.value='';"
-		size="11" style="color:grey;" type="text" value="Enter amount"/>
-              <br>
-	      <input type="image" alt="[Donate using Google]"
-		src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=150990749831378&amp;w=115&amp;h=50&amp;style=white&amp;variant=text&amp;loc=en_US"/>
-	    </form>
-	    <div>&mdash;&nbsp;OR&nbsp;&mdash;</div>
-	    <form action="https://www.paypal.com/cgi-bin/webscr"; method="post"
-              id="donatePaypal">
-	      <!-- input type="hidden" name="amount" value="1234"/ -->
-	      <input type="hidden" name="cmd" value="_xclick"/>
-	      <input type="hidden" name="business" value="pay...@netbsd.org"/>
-	      <input type="hidden" name="item_name" value="The NetBSD Foundation"/>
-	      <input type="hidden" name="no_shipping" value="1"/>
-	      <input type="hidden" name="return" value="http://www.NetBSD.org/"/>
-	      <input type="hidden" name="cancel_return" value="http://www.NetBSD.org/"/>
-	      <input type="image" src="images/links/paypal.gif" name="submit" alt="[Donate using PayPal]"/>
-	    </form>
-	  </div>
-	</div>
-      </div>
-      <div id="mainContent">
-	<div class="half noBorderOnLeft">
-	  <div align="center"><img src="images/20yearsNetBSD.png" alt="20 Years of NetBSD" border="0"></div>
-	  <h2>Welcome to NetBSD<sup>&reg;</sup></h2>
-	  <p>
-	    NetBSD is a free, fast, secure, and highly portable Unix-like
-	    Open Source operating system. It is available for a wide
-	    range of platforms, from large-scale servers and powerful
-	    desktop systems to handheld and embedded devices.  Its clean
-	    design and advanced features make it excellent for use in
-	    both production and research environments, and the source code
-	    is freely available under a business-friendly license. NetBSD is
-	    developed and supported by a large and vivid international
-	    community.  Many applications are readily available through
-	    pkgsrc, the NetBSD Packages Collection.
-	    <span class="more"><a href="about/features.html">&raquo; Learn more</a></span>
-	  </p>
-
-      <!--
-	  <p>
-	    <span class="more"><a href="releases/formal-5/NetBSD-5.0.2.html">&raquo; Latest release: NetBSD 5.0.2</a></span>
-      </p>
-      -->
-
-	  <div class="iconsRight">
-
-<!-- Fundraising last month box
-
-<div id="warnBox">
-  December marks the last month of NetBSD's fundraising campaign!
-  It is a great opportunity to make a Christmas present for the
-  NetBSD project. YOU can still help us to improve NetBSD even more -
-  <a href="/donations/#how-to-donate">donate!</a>
-</div>
--->
-
-<!-- Hackathon box -->
-
-<!-- <div id="hackathonBox"> -->
-<!-- Join the Hackathon on IRC this weekend. -->
-<!-- This Hackathon is focussed on improving Fortran support, updating -->
-<!-- TCL and Tk, and improving testing infrastructure in pkgsrc. -->
-<!--  -->
-<!-- See <a href="http://www.NetBSD.org/community/hackathon.html";>the -->
-<!-- hackathon page</a> for details.  </div> -->
-
-<!-- /Hackathon box -->
-
-<!-- Fundraising 2007 text
-<h2>
-   <span class="more">
-   <a href="foundation/press/fundraising2007.html">Results of the Fundraising Campaign 2007</a>
-   </span>
-</h2>
-
-<p>
- NetBSD depends on
- funding for its operation. A generous donation has enabled us
- to fund development in the area of Symmetric Multiprocessing (SMP), and
- a fundraising drive was started to extend this activity. The goal of
- $50,000US was met thanks to a lot of
- support from companies, users, and our community as a whole. Numerous
- donations from all over the world have  reached us, and we owe great
- gratitude to our donors.
-</p>
-
-<p>
- With the great results of NetBSD's 2007 fundraising campaign, we have
- several options for future work in NetBSD. Besides the usual costs for
- hardware, hosting and legal fees, we intend to continue and increase
- funded development. Areas where such work can be expected
- include SMP, hardware RAID drivers and power management.
-</p>
-
-
-	    <p>
-	      The NetBSD Foundation would like to announce its 2007 fundraising
-	      campaign.  Thanks to donations from earlier this year, we were able to
-	      fund a developer to work on NetBSD and we would like to extend that
-	      opportunity.  We are aiming to raise $50,000 US by the end of the year.
-	      Every donation, both major and minor, is welcome and will be put to good
-	      use!
-	    </p>
-	    <p>
-	      A lot of work is currently underway in various areas of the NetBSD
-	      operating system, the most important focus being the improvement of
-	      NetBSD's SMP and embedded capabilities.  This task requires a lot of
-	      effort on the part of the NetBSD developers, as well as the
-	      provision of the most up to date, modern hardware.
-	    </p>
-	    <p>
-	      We would like to invite the NetBSD community and organizations using
-	      NetBSD to help us achieve these goals.  This fundraising campaign is
-	      an excellent opportunity for everyone to give something back to the
-	      NetBSD project and to help us improve NetBSD even more!
-	    </p>
--->
-
-<p>
-  <span class="more">
-    <a href="releases/formal-6/NetBSD-6.1.html">&raquo; Latest release: NetBSD 6.1</a>
-  </span>
-</p>
-
-<!-- NetBSD 6.1 Release text -->
-
-      <p>
-	NetBSD 6.1, the first feature update of the NetBSD 6
-	release branch, was released on May 18, 2013. It represents
-	a selected subset of fixes deemed important for security or
-	stability reasons.
-
-        <span class="more">
-        <a href="releases/formal-6/NetBSD-6.1.html">&raquo; Full 6.1 Release Notes</a></span>
-      </p>
-
-      <!-- <a href="/donations/"><img src="images/fundraising.png" alt="[Fundraising Meter]" border="0"></a> -->
-
-      <p>
-	A list of download sites providing FTP, AnonCVS, and other
-	services may be found at the
-	<a href="mirrors/">NetBSD mirror sites</a> page. We encourage
-	users who wish to install via ISO images to download
-	via BitTorrent by using <a href="mirrors/torrents/">the
-	torrent files</a> supplied in the disk image area.
-      </p>
-
-    <p>
-    Your donation to the NetBSD Foundation allows the project to make major
-    improvements to the code base. Please <a href="donations/">donate</a>!
-    </p>
-
-<!--    <form action="https://www.paypal.com/cgi-bin/webscr"; method="post">
-      <input type="hidden" name="cmd" value="_xclick"/>
-      <input type="hidden" name="business" value="pay...@netbsd.org"/>
-      <input type="hidden" name="item_name" value="The NetBSD Foundation"/>
-      <input type="hidden" name="no_shipping" value="1"/>
-      <input type="hidden" name="return" value="http://www.NetBSD.org/"/>
-      <input type="hidden" name="cancel_return" value="http://www.NetBSD.org/"/>
-      <input type="image" src="images/links/paypal.gif" name="submit" alt="Donate using PayPal"/>
-    </form>
-    <p>
-      Thanks a lot for your support of the NetBSD project!
-      </p>
--->
-	  </div>
-	</div>
-      </div> <!-- mainContent -->
-
-
-      <div id="news">
-	<div class="quarter">
-
-	  <h3>Latest News</h3>
-	  <ul>
-
-	    <!-- this part automatically generated from changes/index.html through
-		 Makefile-magic -->
-
-	    <!-- NEWS::START -->
-<li><a href="changes/#newdev201306">New Developer in May 2013</a><br/>01 Jun 2013</li>
-<li><a href="changes/#netbsd-6-1">NetBSD 6.1 Released</a><br/>18 May 2013</li>
-<li><a href="changes/#netbsd-6-0-2">NetBSD 6.0.2 Released</a><br/>18 May 2013</li>
-<li><a href="changes/#sa-29Mar-NetBSD-SA2013-003-updated">Updated Security Advisory: NetBSD-SA2013-003 RNG Bug May Result in Weak Cryptographic Keys (REVISED)</a><br/>29 Mar 2013</li>
-	    <!-- NEWS::END -->
-	    <li>
-	      <span class="more">
-		<a href="changes/index.html">&raquo; Archive </a>
-	      </span>
-	    </li>
-            <li>
-	      <span class="more">
-                <a href="http://blog.NetBSD.org/";>&raquo; The NetBSD Blog</a>
-	      </span>
-	    </li>
-	  </ul>
-
-	  <h3>Our Platinum Donor</h3>
-	  <div id="platinumDonorLogo">
-	  <noscript>
-	    <a href="http://www.NetBSD.org/cgi-bin/pdonor.cgi?url=get";>
-	      <img src="http://www.NetBSD.org/cgi-bin/pdonor.cgi?image=get";
-		 alt="[Platinum Donor Logo]">
-	    </a>
-	  </noscript>
-	  </div>
-	  <script type="text/javascript">
-	    <!--
-	    dindex = Math.floor(now.getTime() / 1000 / ROT_INTERVAL);
-	    dindex = dindex % di;
-
-	    var div = document.getElementById('platinumDonorLogo');
-	    var anchor = document.createElement('a');
-	    var image = document.createElement('img');
-
-	    image.setAttribute('src', donors[dindex].Img);
-	    image.setAttribute('alt', "[Platinum Donor Logo]");
-	    anchor.setAttribute('href', donors[dindex].URL);
-
-	    anchor.appendChild(image);
-	    div.appendChild(anchor);
-	    // -->
-	  </script>
-	  <ul>
-	    <li>
-	    <a href="donations/">&raquo; About NetBSD sponsorship</a>
-	    </li>
-	  </ul>
-
-	  <h3>Upcoming Events</h3>
-	  <ul>
-
-	    <!-- this part automatically generated from gallery/events.html through
-		 Makefile-magic -->
-
-	    <!-- EVENTS::START -->
-<li><a href="gallery/events.html#bsdday_2013">Central European BSD-Day 2013, Naples, Italy</a><br/>Apr 2013</li>
-<li><a href="gallery/events.html#bsdcan2013">BSDCan 2013, Ottawa, Canada</a><br/>May 2013</li>
-<li><a href="gallery/events.html#linuxtagB2013">Linuxtag Berlin</a><br/>May 2013</li>
-<li><a href="gallery/events.html#opensourceconf2013-Nagoya">Open Source Conference 2013 Nagoya</a><br/>Jun 2013</li>
-	    <!-- EVENTS::END -->
-
-	    <li>
-	      <span class="more">
-		<a href="gallery/events.html">&raquo; Archive</a>
-	      </span>
-	    </li>
-	  </ul>
-	</div>
-      </div>
-    </div>
-
-
-    <!-- ##### Footer ##### -->
-    <!-- $NetBSD: expected,v 1.4 2013/06/06 01:45:56 agc Exp $ -->
-    <div class="rowOfBoxes">
-      <div id="footer">
-	<div id="footerLogo">
-	  <a href="http://www.isc.org/";><img src="images/hosted-isc.png"
-	     alt="www.NetBSD.org is hosted at ISC"
-	     border="0" width="84" height="41"/></a>
-	</div>
-	<div id="footerContent">
-	  <span class="footfeed">
-	    <a href="http://www.NetBSD.org/cgi-bin/feedback.cgi";>
-	      Contact</a> |
-	  </span>
-	  <span class="footcopy"><a href="about/disclaimer.html">
-	    Disclaimer</a> |
-	    <span class="copyright">
-	      Copyright &copy; 1994-2013 The NetBSD Foundation, Inc.
-	    </span>
-	    ALL
-	    RIGHTS RESERVED. <br /> NetBSD<sup>&reg;</sup> is a registered
-	    trademark of The NetBSD Foundation, Inc.
-	  </span>
-	</div>
-      </div>
-    </div>
-  </div></body>
-</html>
-
+"http_asget" not found
 29. Testing netdiff
 30. Testing netdiff with diffs
 ---
-> # $NetBSD: expected,v 1.4 2013/06/06 01:45:56 agc Exp $
+> # $NetBSD: expected,v 1.5 2018/01/17 01:38:36 agc Exp $
 5c5
 < PROG=		eawk
 ---
@@ -902,7 +345,7 @@ Makefile
 < 	@echo "31. Testing hmac"
 < 	@env LD_LIBRARY_PATH=${LIBEAWKDIR}:${LIB_HMAC} ./${PROG} 'BEGIN { use("hmac"); mac = hmac("sha1", "akey", "the quick brown fox jumps over the lazy dog"); print hmac_bin2str(mac) }'
 < 	@echo "32. Testing db"
-< 	@env LD_LIBRARY_PATH=${LIBEAWKDIR}:${LIB_DB} ./${PROG} 'BEGIN { use("db"); db = dbopen("/etc/pwd.db", O_RDONLY, 0666, "hash"); for (f = R_FIRST ; s = dbseq(db, s, f) ; f = R_NEXT) print s; }'
+< 	@env LD_LIBRARY_PATH=${LIBEAWKDIR}:${LIB_DB}:${LIB_C} ./${PROG} 'BEGIN { use("db"); use("c"); info["type"] = "hash"; db = dbopen("/etc/pwd.db", O_RDONLY, 0666, info); while (dbseq(db, key, val, R_NEXT) == 0) print val["data"]; }'
 < 	@echo "33. Testing hex strings"
 < 	@env LD_LIBRARY_PATH=${LIBEAWKDIR}:${LIB_DB} ./${PROG} 'BEGIN { s="\x20a\x20b\x20c"; printf(",%s,\n", s) }'
 < 	@echo "34. Testing zlib"
@@ -914,8 +357,8 @@ Makefile
 
 30. Testing unidiff with diffs
 @@ -1,8 +1,8 @@
--# $NetBSD: expected,v 1.4 2013/06/06 01:45:56 agc Exp $
-+# $NetBSD: expected,v 1.4 2013/06/06 01:45:56 agc Exp $
+-# $NetBSD: expected,v 1.5 2018/01/17 01:38:36 agc Exp $
++# $NetBSD: expected,v 1.5 2018/01/17 01:38:36 agc Exp $
  
  .include <bsd.own.mk>
  
@@ -1055,7 +498,7 @@ Makefile
 -	@echo "31. Testing hmac"
 -	@env LD_LIBRARY_PATH=${LIBEAWKDIR}:${LIB_HMAC} ./${PROG} 'BEGIN { use("hmac"); mac = hmac("sha1", "akey", "the quick brown fox jumps over the lazy dog"); print hmac_bin2str(mac) }'
 -	@echo "32. Testing db"
--	@env LD_LIBRARY_PATH=${LIBEAWKDIR}:${LIB_DB} ./${PROG} 'BEGIN { use("db"); db = dbopen("/etc/pwd.db", O_RDONLY, 0666, "hash"); for (f = R_FIRST ; s = dbseq(db, s, f) ; f = R_NEXT) print s; }'
+-	@env LD_LIBRARY_PATH=${LIBEAWKDIR}:${LIB_DB}:${LIB_C} ./${PROG} 'BEGIN { use("db"); use("c"); info["type"] = "hash"; db = dbopen("/etc/pwd.db", O_RDONLY, 0666, info); while (dbseq(db, key, val, R_NEXT) == 0) print val["data"]; }'
 -	@echo "33. Testing hex strings"
 -	@env LD_LIBRARY_PATH=${LIBEAWKDIR}:${LIB_DB} ./${PROG} 'BEGIN { s="\x20a\x20b\x20c"; printf(",%s,\n", s) }'
 -	@echo "34. Testing zlib"
@@ -1066,26 +509,21 @@ Makefile
  	@echo "All tests complete"
 
 31. Testing hmac
-1e0a7dd5e3789351b23fdfe5dec05bae53b84bb7
+"hmac_bin2str" not found
 32. Testing db
 games
 _proxy
 _timedc
-nobody
-quagga
-avahi
-pulse
+_unbound
+lp
 postfix
 named
 _timedc
 _sdpd
+_rtadvd
+_nsd
 nobody
-agc
-prosody
-dirmngr
-polkit
 cyrus
-stud
 bin
 games
 named
@@ -1094,13 +532,7 @@ _proxy
 _sdpd
 _httpd
 _tss
-prosody
-cjparker
-avahi
-haldaemon
-haldaemon
-pulse
-distcc
+uucp
 root
 root
 ntpd
@@ -1110,12 +542,9 @@ _sdpd
 _httpd
 _mdnsd
 _tests
-quagga
-cjparker
-dbus
-pulse
-distcc
-varnish
+_unbound
+_unbound
+nobody
 toor
 daemon
 sshd
@@ -1124,15 +553,10 @@ _rwhod
 _httpd
 _mdnsd
 _tests
+_nsd
 nobody
 agc
-cjparker
-dirmngr
-lp
-polkit
-cyrus
-varnish
-stud
+agc
 root
 toor
 daemon
@@ -1144,11 +568,12 @@ _pflogd
 _tests
 _tcpdump
 _tcpdump
+_rtadvd
+_nsd
 uucp
-dirmngr
+dbus
 lp
-avahi
-distcc
+
 operator
 bin
 games
@@ -1162,23 +587,17 @@ _tcpdump
 _tss
 uucp
 agc
-dbus
-polkit
-varnish
-
+lp
 bin
 postfix
 ntpd
 _proxy
 _tss
-uucp
-prosody
-quagga
+_rtadvd
 dbus
-lp
-haldaemon
+dbus
+cyrus
 cyrus
-stud
 33. Testing hex strings
 , a b c,
 34. Testing zlib

Index: othersrc/external/historical/eawk/dist/awkgram.y
diff -u othersrc/external/historical/eawk/dist/awkgram.y:1.3 othersrc/external/historical/eawk/dist/awkgram.y:1.4
--- othersrc/external/historical/eawk/dist/awkgram.y:1.3	Fri May 31 05:56:36 2013
+++ othersrc/external/historical/eawk/dist/awkgram.y	Wed Jan 17 01:38:36 2018
@@ -22,7 +22,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE
 THIS SOFTWARE.
 ****************************************************************/
 
-%pure_parser
+%pure-parser
 
 %{
 #include <stdio.h>

Index: othersrc/external/historical/eawk/extend/Makefile
diff -u othersrc/external/historical/eawk/extend/Makefile:1.5 othersrc/external/historical/eawk/extend/Makefile:1.6
--- othersrc/external/historical/eawk/extend/Makefile:1.5	Sat Jun  8 10:48:57 2013
+++ othersrc/external/historical/eawk/extend/Makefile	Wed Jan 17 01:38:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/06/08 10:48:57 agc Exp $
+# $NetBSD: Makefile,v 1.6 2018/01/17 01:38:36 agc Exp $
 
 SUBDIR+=	archive
 SUBDIR+=	base64
@@ -41,7 +41,7 @@ SUBDIR+=	progress
 SUBDIR+=	rs
 .endif
 SUBDIR+=	soundex
-SUBDIR+=	sqlite3
+#SUBDIR+=	sqlite3
 SUBDIR+=	termcap
 .if exists(/usr/include/threshold.h)
 SUBDIR+=	threshold

Index: othersrc/external/historical/eawk/extend/archive/archive.c
diff -u othersrc/external/historical/eawk/extend/archive/archive.c:1.1 othersrc/external/historical/eawk/extend/archive/archive.c:1.2
--- othersrc/external/historical/eawk/extend/archive/archive.c:1.1	Wed Jun  5 00:55:26 2013
+++ othersrc/external/historical/eawk/extend/archive/archive.c	Wed Jan 17 01:38:36 2018
@@ -109,7 +109,7 @@ eawk_archive_archive_read_new(void *veaw
 	USE_ARG(argc);
 	USE_ARG(a);
 	if ((arch = archive_read_new()) != NULL) {
-		archive_read_support_compression_all(arch);
+		archive_read_support_filter_all(arch);
 		archive_read_support_format_all(arch);
 	}
 	/* return code */
@@ -117,9 +117,9 @@ eawk_archive_archive_read_new(void *veaw
 	return eawk->fp->retval;
 }
 
-/* archive_read_support_compression_all function */
+/* archive_read_support_filter_all function */
 static awkcell_t *
-eawk_archive_archive_read_support_compression_all(void *veawk, char *name, int argc, awkcell_t **a)
+eawk_archive_archive_read_support_filter_all(void *veawk, char *name, int argc, awkcell_t **a)
 {
 	struct archive	*arch;
 	eawk_t		*eawk = (eawk_t *)veawk;
@@ -129,7 +129,7 @@ eawk_archive_archive_read_support_compre
 	rc = ARCHIVE_FATAL;
 	if (argc == 1) {
 		arch = n2ptr((int64_t)eawk_getfval(eawk, a[0]));
-		rc = archive_read_support_compression_all(arch);
+		rc = archive_read_support_filter_all(arch);
 	}
 	/* return code */
 	eawk_setfval(eawk, eawk->fp->retval, (awknum_t)rc);
@@ -240,9 +240,9 @@ eawk_archive_archive_read_close(void *ve
 	return eawk->fp->retval;
 }
 
-/* archive_read_finish function */
+/* archive_read_free function */
 static awkcell_t *
-eawk_archive_archive_read_finish(void *veawk, char *name, int argc, awkcell_t **a)
+eawk_archive_archive_read_free(void *veawk, char *name, int argc, awkcell_t **a)
 {
 	struct archive	*arch;
 	eawk_t		*eawk = (eawk_t *)veawk;
@@ -252,7 +252,7 @@ eawk_archive_archive_read_finish(void *v
 	rc = ARCHIVE_FATAL;
 	if (argc == 1) {
 		arch = n2ptr((int64_t)eawk_getfval(eawk, a[0]));
-		rc = archive_read_finish(arch);
+		rc = archive_read_free(arch);
 	}
 	/* return code */
 	eawk_setfval(eawk, eawk->fp->retval, (awknum_t)rc);
@@ -270,7 +270,7 @@ eawk_archive_archive_write_new(void *vea
 	USE_ARG(argc);
 	USE_ARG(a);
 	if ((arch = archive_write_new()) != NULL) {
-		archive_write_set_compression_bzip2(arch);
+		archive_write_add_filter_bzip2(arch);
 		archive_write_set_format_ustar(arch);
 	}
 	/* return code */
@@ -357,9 +357,9 @@ eawk_archive_archive_write_close(void *v
 	return eawk->fp->retval;
 }
 
-/* archive_write_finish function */
+/* archive_write_free function */
 static awkcell_t *
-eawk_archive_archive_write_finish(void *veawk, char *name, int argc, awkcell_t **a)
+eawk_archive_archive_write_free(void *veawk, char *name, int argc, awkcell_t **a)
 {
 	struct archive	*arch;
 	eawk_t		*eawk = (eawk_t *)veawk;
@@ -369,7 +369,7 @@ eawk_archive_archive_write_finish(void *
 	rc = ARCHIVE_FATAL;
 	if (argc == 1) {
 		arch = n2ptr((int64_t)eawk_getfval(eawk, a[0]));
-		rc = archive_write_finish(arch);
+		rc = archive_write_free(arch);
 	}
 	/* return code */
 	eawk_setfval(eawk, eawk->fp->retval, (awknum_t)rc);
@@ -390,13 +390,13 @@ eawk_use_archive(eawk_t *eawk)
 	if (eawk_find_lib(eawk, "archive") < 0) {
 		eawk_archive_constants(eawk);
 		eawk_register_func(eawk, "archive", "archive_read_close", eawk_archive_archive_read_close);
-		eawk_register_func(eawk, "archive", "archive_read_finish", eawk_archive_archive_read_finish);
+		eawk_register_func(eawk, "archive", "archive_read_free", eawk_archive_archive_read_free);
 		eawk_register_func(eawk, "archive", "archive_read_new", eawk_archive_archive_read_new);
 		eawk_register_func(eawk, "archive", "archive_read_next_header", eawk_archive_archive_read_next_header);
 		eawk_register_func(eawk, "archive", "archive_read_open_filename",
 			eawk_archive_archive_read_open_filename);
-		eawk_register_func(eawk, "archive", "archive_read_support_compression_all",
-			eawk_archive_archive_read_support_compression_all);
+		eawk_register_func(eawk, "archive", "archive_read_support_filter_all",
+			eawk_archive_archive_read_support_filter_all);
 		eawk_register_func(eawk, "archive", "archive_read_support_format_all",
 			eawk_archive_archive_read_support_format_all);
 		eawk_register_func(eawk, "archive", "archive_write_new", eawk_archive_archive_write_new);
@@ -404,7 +404,7 @@ eawk_use_archive(eawk_t *eawk)
 			eawk_archive_archive_write_open_filename);
 		eawk_register_func(eawk, "archive", "archive_write_entry", eawk_archive_archive_write_entry);
 		eawk_register_func(eawk, "archive", "archive_write_close", eawk_archive_archive_write_close);
-		eawk_register_func(eawk, "archive", "archive_write_finish", eawk_archive_archive_write_finish);
+		eawk_register_func(eawk, "archive", "archive_write_free", eawk_archive_archive_write_free);
 	}
 	return 1;
 }

Index: othersrc/external/historical/eawk/extend/netpgpverify/netpgpverify.c
diff -u othersrc/external/historical/eawk/extend/netpgpverify/netpgpverify.c:1.1 othersrc/external/historical/eawk/extend/netpgpverify/netpgpverify.c:1.2
--- othersrc/external/historical/eawk/extend/netpgpverify/netpgpverify.c:1.1	Wed Jun  5 00:55:26 2013
+++ othersrc/external/historical/eawk/extend/netpgpverify/netpgpverify.c	Wed Jan 17 01:38:37 2018
@@ -102,9 +102,9 @@ eawk_netpgpverify_pgpv_alloc(void *veawk
 	if (argc == 1) {
 		type = eawk_getsval(eawk, a[0]);
 		if (strcmp(type, "pgpv") == 0) {
-			v = calloc(sizeof(pgpv_t), 1);
+			v = pgpv_new();
 		} else if (strcmp(type, "pgpv_cursor") == 0) {
-			v = calloc(sizeof(pgpv_cursor_t), 1);
+			v = pgpv_new_cursor();
 		}
 	}
 	eawk_setfval(eawk, eawk->fp->retval, (awknum_t)p2num(v));
@@ -137,7 +137,7 @@ eawk_netpgpverify_pgpv_read_pubring(void
 static awkcell_t *
 eawk_netpgpverify_pgpv_verify(void *veawk, char *name, int argc, awkcell_t **a)
 {
-	pgpv_cursor_t	 cursor;
+	pgpv_cursor_t	*cursor;
 	const char	*f;
 	awkcell_t	*array;
 	awkcell_t	*cell;
@@ -153,19 +153,20 @@ eawk_netpgpverify_pgpv_verify(void *veaw
 	if (argc == 3) {
 		pgpv = n2ptr((int64_t)eawk_getfval(eawk, a[0]));
 		f = (const char *)eawk_getsval(eawk, a[1]);
-		memset(&cursor, 0x0, sizeof(cursor));
-		if ((rc = pgpv_verify(&cursor, pgpv, f, -1)) != 0) {
+		cursor = pgpv_new_cursor();
+		if ((rc = pgpv_verify(cursor, pgpv, f, -1)) != 0) {
 			array = eawk_new_array(eawk, a[2]);
-			set_array_field(eawk, array, "time", 0, NULL, (int64_t)cursor.sigtime);
-			pgpv_get_entry(pgpv, ARRAY_ELEMENT(cursor.found, 0), &s);
+			set_array_field(eawk, array, "time", 0, NULL, pgpv_get_cursor_num(cursor, "sigtime"));
+			pgpv_get_entry(pgpv, pgpv_get_cursor_element(cursor, 0), &s, NULL);
 			set_array_field(eawk, array, "signer", 0, s, 0);
 			set_array_field(eawk, array, "name", 0, f, 0);
-			size = pgpv_get_verified(&cursor, rc, &s);
+			size = pgpv_get_verified(cursor, rc, &s);
 			cell = eawk_var_set(eawk, "data", (const char *)s, 0.0,
 				EAWK_STR, (awkarray_t *)(void *)array->str);
 			/* now set the binary data properly */
 			eawk_setsvalN(eawk, cell, (const char *)s, size);
 		}
+		pgpv_cursor_close(cursor);
 	}
 	/* return code */
 	eawk_setfval(eawk, eawk->fp->retval, (awknum_t)rc);
@@ -211,7 +212,7 @@ eawk_netpgpverify_pgpv_get_entry(void *v
 	if (argc == 2) {
 		pgpv = n2ptr((int64_t)eawk_getfval(eawk, a[0]));
 		ent = (unsigned)eawk_getfval(eawk, a[1]);
-		rc = pgpv_get_entry(pgpv, ent, &s);
+		rc = pgpv_get_entry(pgpv, ent, &s, NULL);
 	}
 	/* return code */
 	eawk_setsvalN(eawk, eawk->fp->retval, s, rc);

Index: othersrc/external/historical/eawk/lib/Makefile
diff -u othersrc/external/historical/eawk/lib/Makefile:1.1 othersrc/external/historical/eawk/lib/Makefile:1.2
--- othersrc/external/historical/eawk/lib/Makefile:1.1	Fri May 31 05:56:38 2013
+++ othersrc/external/historical/eawk/lib/Makefile	Wed Jan 17 01:38:37 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2013/05/31 05:56:38 agc Exp $
+#	$NetBSD: Makefile,v 1.2 2018/01/17 01:38:37 agc Exp $
 
 .include <bsd.own.mk>
 
@@ -8,7 +8,6 @@ DIST=	${.CURDIR}/../dist
 LIB=	eawk
 SRCS=	awkgram.y b.c ext.c lex.c lib.c parse.c proctab.c run.c tran.c
 CPPFLAGS+=	-I. -I${DIST} -DHAS_ISBLANK
-YACC=	bison
 YFLAGS+= -p eawk_ -d 
 CPPFLAGS.run.c+= -Wno-format-nonliteral
 CPPFLAGS.tran.c+= -Wno-format-nonliteral

Reply via email to