From owner-svn-src-vendor@FreeBSD.ORG Wed Jul 24 07:12:59 2013 Return-Path: <owner-svn-src-vendor@FreeBSD.ORG> Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 92963C53; Wed, 24 Jul 2013 07:12:59 +0000 (UTC) (envelope-from erwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 803362DA1; Wed, 24 Jul 2013 07:12:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6O7CxYJ053115; Wed, 24 Jul 2013 07:12:59 GMT (envelope-from erwin@svn.freebsd.org) Received: (from erwin@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6O7CuKL053097; Wed, 24 Jul 2013 07:12:56 GMT (envelope-from erwin@svn.freebsd.org) Message-Id: <201307240712.r6O7CuKL053097@svn.freebsd.org> From: Erwin Lansing <erwin@FreeBSD.org> Date: Wed, 24 Jul 2013 07:12:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r253592 - in vendor/bind9/dist: . bin bin/check bin/confgen bin/dig bin/dig/include/dig bin/dnssec bin/named bin/named/include/named bin/named/unix bin/nsupdate bin/rndc bin/tools doc/a... X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree <svn-src-vendor.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>, <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor> List-Post: <mailto:svn-src-vendor@freebsd.org> List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>, <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 24 Jul 2013 07:12:59 -0000 Author: erwin Date: Wed Jul 24 07:12:55 2013 New Revision: 253592 URL: http://svnweb.freebsd.org/changeset/base/253592 Log: Vendor import of Bind 9.8.5-P1 Approved by: delphij (mentor) Sponsored by: DK Hostmaster A/S Added: vendor/bind9/dist/lib/dns/rdata/generic/eui48_108.c vendor/bind9/dist/lib/dns/rdata/generic/eui48_108.h vendor/bind9/dist/lib/dns/rdata/generic/eui64_109.c vendor/bind9/dist/lib/dns/rdata/generic/eui64_109.h vendor/bind9/dist/lib/dns/rdata/generic/l32_105.c vendor/bind9/dist/lib/dns/rdata/generic/l32_105.h vendor/bind9/dist/lib/dns/rdata/generic/l64_106.c vendor/bind9/dist/lib/dns/rdata/generic/l64_106.h vendor/bind9/dist/lib/dns/rdata/generic/lp_107.c vendor/bind9/dist/lib/dns/rdata/generic/lp_107.h vendor/bind9/dist/lib/dns/rdata/generic/nid_104.c vendor/bind9/dist/lib/dns/rdata/generic/nid_104.h vendor/bind9/dist/lib/dns/rdata/generic/uri_256.c vendor/bind9/dist/lib/dns/rdata/generic/uri_256.h vendor/bind9/dist/lib/isc/include/isc/regex.h vendor/bind9/dist/lib/isc/regex.c vendor/bind9/dist/libtool.m4/libtool.m4 vendor/bind9/dist/libtool.m4/ltoptions.m4 vendor/bind9/dist/libtool.m4/ltsugar.m4 vendor/bind9/dist/libtool.m4/ltversion.m4 vendor/bind9/dist/libtool.m4/lt~obsolete.m4 Replaced: vendor/bind9/dist/libtool.m4/ Modified: vendor/bind9/dist/CHANGES vendor/bind9/dist/COPYRIGHT vendor/bind9/dist/FAQ vendor/bind9/dist/FAQ.xml vendor/bind9/dist/Makefile.in vendor/bind9/dist/README vendor/bind9/dist/aclocal.m4 vendor/bind9/dist/bin/Makefile.in vendor/bind9/dist/bin/check/check-tool.c vendor/bind9/dist/bin/check/named-checkconf.c vendor/bind9/dist/bin/check/named-checkzone.8 vendor/bind9/dist/bin/check/named-checkzone.c vendor/bind9/dist/bin/check/named-checkzone.docbook vendor/bind9/dist/bin/check/named-checkzone.html vendor/bind9/dist/bin/confgen/keygen.c vendor/bind9/dist/bin/confgen/rndc-confgen.c vendor/bind9/dist/bin/dig/dig.1 vendor/bind9/dist/bin/dig/dig.c vendor/bind9/dist/bin/dig/dig.docbook vendor/bind9/dist/bin/dig/dig.html vendor/bind9/dist/bin/dig/dighost.c vendor/bind9/dist/bin/dig/host.c vendor/bind9/dist/bin/dig/include/dig/dig.h vendor/bind9/dist/bin/dnssec/dnssec-keyfromlabel.c vendor/bind9/dist/bin/dnssec/dnssec-keygen.c vendor/bind9/dist/bin/dnssec/dnssec-revoke.c vendor/bind9/dist/bin/dnssec/dnssec-settime.c vendor/bind9/dist/bin/dnssec/dnssec-signzone.c vendor/bind9/dist/bin/named/Makefile.in vendor/bind9/dist/bin/named/client.c vendor/bind9/dist/bin/named/config.c vendor/bind9/dist/bin/named/control.c vendor/bind9/dist/bin/named/controlconf.c vendor/bind9/dist/bin/named/include/named/client.h vendor/bind9/dist/bin/named/include/named/globals.h vendor/bind9/dist/bin/named/include/named/server.h vendor/bind9/dist/bin/named/interfacemgr.c vendor/bind9/dist/bin/named/log.c vendor/bind9/dist/bin/named/logconf.c vendor/bind9/dist/bin/named/lwresd.c vendor/bind9/dist/bin/named/main.c vendor/bind9/dist/bin/named/named.conf.5 vendor/bind9/dist/bin/named/named.conf.docbook vendor/bind9/dist/bin/named/named.conf.html vendor/bind9/dist/bin/named/query.c vendor/bind9/dist/bin/named/server.c vendor/bind9/dist/bin/named/statschannel.c vendor/bind9/dist/bin/named/tkeyconf.c vendor/bind9/dist/bin/named/tsigconf.c vendor/bind9/dist/bin/named/unix/dlz_dlopen_driver.c vendor/bind9/dist/bin/named/update.c vendor/bind9/dist/bin/named/xfrout.c vendor/bind9/dist/bin/named/zoneconf.c vendor/bind9/dist/bin/nsupdate/nsupdate.c vendor/bind9/dist/bin/rndc/rndc.c vendor/bind9/dist/bin/tools/genrandom.c vendor/bind9/dist/bin/tools/isc-hmac-fixup.8 vendor/bind9/dist/bin/tools/isc-hmac-fixup.docbook vendor/bind9/dist/bin/tools/isc-hmac-fixup.html vendor/bind9/dist/config.h.in vendor/bind9/dist/config.threads.in vendor/bind9/dist/configure.in vendor/bind9/dist/doc/arm/Bv9ARM-book.xml vendor/bind9/dist/doc/arm/Bv9ARM.ch01.html vendor/bind9/dist/doc/arm/Bv9ARM.ch02.html vendor/bind9/dist/doc/arm/Bv9ARM.ch03.html vendor/bind9/dist/doc/arm/Bv9ARM.ch04.html vendor/bind9/dist/doc/arm/Bv9ARM.ch05.html vendor/bind9/dist/doc/arm/Bv9ARM.ch06.html vendor/bind9/dist/doc/arm/Bv9ARM.ch07.html vendor/bind9/dist/doc/arm/Bv9ARM.ch08.html vendor/bind9/dist/doc/arm/Bv9ARM.ch09.html vendor/bind9/dist/doc/arm/Bv9ARM.ch10.html vendor/bind9/dist/doc/arm/Bv9ARM.html vendor/bind9/dist/doc/arm/Bv9ARM.pdf vendor/bind9/dist/doc/arm/man.arpaname.html vendor/bind9/dist/doc/arm/man.ddns-confgen.html vendor/bind9/dist/doc/arm/man.dig.html vendor/bind9/dist/doc/arm/man.dnssec-dsfromkey.html vendor/bind9/dist/doc/arm/man.dnssec-keyfromlabel.html vendor/bind9/dist/doc/arm/man.dnssec-keygen.html vendor/bind9/dist/doc/arm/man.dnssec-revoke.html vendor/bind9/dist/doc/arm/man.dnssec-settime.html vendor/bind9/dist/doc/arm/man.dnssec-signzone.html vendor/bind9/dist/doc/arm/man.genrandom.html vendor/bind9/dist/doc/arm/man.host.html vendor/bind9/dist/doc/arm/man.isc-hmac-fixup.html vendor/bind9/dist/doc/arm/man.named-checkconf.html vendor/bind9/dist/doc/arm/man.named-checkzone.html vendor/bind9/dist/doc/arm/man.named-journalprint.html vendor/bind9/dist/doc/arm/man.named.html vendor/bind9/dist/doc/arm/man.nsec3hash.html vendor/bind9/dist/doc/arm/man.nsupdate.html vendor/bind9/dist/doc/arm/man.rndc-confgen.html vendor/bind9/dist/doc/arm/man.rndc.conf.html vendor/bind9/dist/doc/arm/man.rndc.html vendor/bind9/dist/doc/arm/pkcs11.xml vendor/bind9/dist/doc/misc/options vendor/bind9/dist/isc-config.sh.in vendor/bind9/dist/lib/Makefile.in vendor/bind9/dist/lib/bind9/Makefile.in vendor/bind9/dist/lib/bind9/api vendor/bind9/dist/lib/bind9/check.c vendor/bind9/dist/lib/dns/Makefile.in vendor/bind9/dist/lib/dns/acache.c vendor/bind9/dist/lib/dns/adb.c vendor/bind9/dist/lib/dns/api vendor/bind9/dist/lib/dns/cache.c vendor/bind9/dist/lib/dns/client.c vendor/bind9/dist/lib/dns/db.c vendor/bind9/dist/lib/dns/dispatch.c vendor/bind9/dist/lib/dns/dlz.c vendor/bind9/dist/lib/dns/dnssec.c vendor/bind9/dist/lib/dns/dst_api.c vendor/bind9/dist/lib/dns/dst_internal.h vendor/bind9/dist/lib/dns/dst_openssl.h vendor/bind9/dist/lib/dns/ecdb.c vendor/bind9/dist/lib/dns/gen.c vendor/bind9/dist/lib/dns/gssapictx.c vendor/bind9/dist/lib/dns/include/dns/acache.h vendor/bind9/dist/lib/dns/include/dns/db.h vendor/bind9/dist/lib/dns/include/dns/message.h vendor/bind9/dist/lib/dns/include/dns/name.h vendor/bind9/dist/lib/dns/include/dns/ncache.h vendor/bind9/dist/lib/dns/include/dns/nsec.h vendor/bind9/dist/lib/dns/include/dns/nsec3.h vendor/bind9/dist/lib/dns/include/dns/rdata.h vendor/bind9/dist/lib/dns/include/dns/result.h vendor/bind9/dist/lib/dns/include/dns/rpz.h vendor/bind9/dist/lib/dns/include/dns/types.h vendor/bind9/dist/lib/dns/include/dns/validator.h vendor/bind9/dist/lib/dns/include/dns/view.h vendor/bind9/dist/lib/dns/include/dns/zone.h vendor/bind9/dist/lib/dns/include/dst/dst.h vendor/bind9/dist/lib/dns/master.c vendor/bind9/dist/lib/dns/message.c vendor/bind9/dist/lib/dns/name.c vendor/bind9/dist/lib/dns/ncache.c vendor/bind9/dist/lib/dns/nsec.c vendor/bind9/dist/lib/dns/nsec3.c vendor/bind9/dist/lib/dns/openssl_link.c vendor/bind9/dist/lib/dns/openssldsa_link.c vendor/bind9/dist/lib/dns/opensslecdsa_link.c vendor/bind9/dist/lib/dns/opensslgost_link.c vendor/bind9/dist/lib/dns/opensslrsa_link.c vendor/bind9/dist/lib/dns/peer.c vendor/bind9/dist/lib/dns/rbt.c vendor/bind9/dist/lib/dns/rbtdb.c vendor/bind9/dist/lib/dns/rdata.c vendor/bind9/dist/lib/dns/rdata/any_255/tsig_250.c vendor/bind9/dist/lib/dns/rdata/generic/dlv_32769.c vendor/bind9/dist/lib/dns/rdata/generic/mx_15.c vendor/bind9/dist/lib/dns/rdata/generic/sshfp_44.c vendor/bind9/dist/lib/dns/rdata/generic/txt_16.c vendor/bind9/dist/lib/dns/rdata/in_1/naptr_35.c vendor/bind9/dist/lib/dns/rdata/in_1/nsap_22.c vendor/bind9/dist/lib/dns/request.c vendor/bind9/dist/lib/dns/resolver.c vendor/bind9/dist/lib/dns/result.c vendor/bind9/dist/lib/dns/rootns.c vendor/bind9/dist/lib/dns/rpz.c vendor/bind9/dist/lib/dns/sdb.c vendor/bind9/dist/lib/dns/sdlz.c vendor/bind9/dist/lib/dns/spnego.c vendor/bind9/dist/lib/dns/spnego_asn1.c vendor/bind9/dist/lib/dns/ssu.c vendor/bind9/dist/lib/dns/ssu_external.c vendor/bind9/dist/lib/dns/tkey.c vendor/bind9/dist/lib/dns/tsig.c vendor/bind9/dist/lib/dns/validator.c vendor/bind9/dist/lib/dns/view.c vendor/bind9/dist/lib/dns/xfrin.c vendor/bind9/dist/lib/dns/zone.c vendor/bind9/dist/lib/export/dns/Makefile.in vendor/bind9/dist/lib/export/irs/Makefile.in vendor/bind9/dist/lib/export/isc/Makefile.in vendor/bind9/dist/lib/export/isc/include/isc/Makefile.in vendor/bind9/dist/lib/export/isc/nls/Makefile.in vendor/bind9/dist/lib/export/isc/nothreads/Makefile.in vendor/bind9/dist/lib/export/isc/pthreads/Makefile.in vendor/bind9/dist/lib/export/isc/unix/Makefile.in vendor/bind9/dist/lib/export/isccfg/Makefile.in vendor/bind9/dist/lib/export/samples/Makefile.in vendor/bind9/dist/lib/export/samples/nsprobe.c vendor/bind9/dist/lib/export/samples/sample-async.c vendor/bind9/dist/lib/export/samples/sample-gai.c vendor/bind9/dist/lib/export/samples/sample-request.c vendor/bind9/dist/lib/export/samples/sample-update.c vendor/bind9/dist/lib/export/samples/sample.c vendor/bind9/dist/lib/irs/api vendor/bind9/dist/lib/irs/dnsconf.c vendor/bind9/dist/lib/irs/getaddrinfo.c vendor/bind9/dist/lib/irs/getnameinfo.c vendor/bind9/dist/lib/irs/resconf.c vendor/bind9/dist/lib/isc/Makefile.in vendor/bind9/dist/lib/isc/api vendor/bind9/dist/lib/isc/buffer.c vendor/bind9/dist/lib/isc/include/isc/Makefile.in vendor/bind9/dist/lib/isc/include/isc/buffer.h vendor/bind9/dist/lib/isc/include/isc/file.h vendor/bind9/dist/lib/isc/include/isc/list.h vendor/bind9/dist/lib/isc/include/isc/mem.h vendor/bind9/dist/lib/isc/include/isc/namespace.h vendor/bind9/dist/lib/isc/include/isc/region.h vendor/bind9/dist/lib/isc/include/isc/sockaddr.h vendor/bind9/dist/lib/isc/include/isc/socket.h vendor/bind9/dist/lib/isc/include/isc/task.h vendor/bind9/dist/lib/isc/include/isc/timer.h vendor/bind9/dist/lib/isc/inet_aton.c vendor/bind9/dist/lib/isc/mem.c vendor/bind9/dist/lib/isc/nothreads/Makefile.in vendor/bind9/dist/lib/isc/parseint.c vendor/bind9/dist/lib/isc/pthreads/thread.c vendor/bind9/dist/lib/isc/ratelimiter.c vendor/bind9/dist/lib/isc/sockaddr.c vendor/bind9/dist/lib/isc/sparc64/include/isc/atomic.h vendor/bind9/dist/lib/isc/symtab.c vendor/bind9/dist/lib/isc/task.c vendor/bind9/dist/lib/isc/taskpool.c vendor/bind9/dist/lib/isc/timer.c vendor/bind9/dist/lib/isc/timer_api.c vendor/bind9/dist/lib/isc/unix/entropy.c vendor/bind9/dist/lib/isc/unix/file.c vendor/bind9/dist/lib/isc/unix/include/isc/time.h vendor/bind9/dist/lib/isc/unix/net.c vendor/bind9/dist/lib/isc/unix/socket.c vendor/bind9/dist/lib/isc/unix/time.c vendor/bind9/dist/lib/isccc/api vendor/bind9/dist/lib/isccc/cc.c vendor/bind9/dist/lib/isccfg/Makefile.in vendor/bind9/dist/lib/isccfg/aclconf.c vendor/bind9/dist/lib/isccfg/api vendor/bind9/dist/lib/isccfg/include/isccfg/cfg.h vendor/bind9/dist/lib/isccfg/namedconf.c vendor/bind9/dist/lib/isccfg/parser.c vendor/bind9/dist/lib/lwres/api vendor/bind9/dist/lib/lwres/context.c vendor/bind9/dist/lib/lwres/getaddrinfo.c vendor/bind9/dist/lib/lwres/getipnode.c vendor/bind9/dist/lib/lwres/getnameinfo.c vendor/bind9/dist/lib/lwres/getrrset.c vendor/bind9/dist/lib/lwres/lwinetaton.c vendor/bind9/dist/lib/lwres/print.c vendor/bind9/dist/ltmain.sh vendor/bind9/dist/make/rules.in vendor/bind9/dist/version Modified: vendor/bind9/dist/CHANGES ============================================================================== --- vendor/bind9/dist/CHANGES Wed Jul 24 06:13:00 2013 (r253591) +++ vendor/bind9/dist/CHANGES Wed Jul 24 07:12:55 2013 (r253592) @@ -1,20 +1,386 @@ - --- 9.8.4-P2 released --- + --- 9.8.5-P1 released --- -3516. [security] Removed the check for regex.h in configure in order - to disable regex syntax checking, as it exposes - BIND to a critical flaw in libregex on some - platforms. [RT #32688] +3584. [security] Caching data from an incompletely signed zone could + trigger an assertion failure in resolver.c [RT #33690] - --- 9.8.4-P1 released --- + --- 9.8.5 released --- -3407. [security] Named could die on specific queries with dns64 enabled. - [Addressed in change #3388 for BIND 9.8.5 and 9.9.3.] +3568. [cleanup] Add a product description line to the version file, + to be reported by named -v/-V. [RT #33366] - --- 9.8.4 released --- +3567. [bug] Silence clang static analyzer warnings. [RT #33365] + +3563. [contrib] zone2sqlite failed with some table names. [RT #33375] + +3561. [bug] dig: issue a warning if an EDNS query returns FORMERR + or NOTIMP. Adjust usage message. [RT #33363] + + --- 9.8.5rc1 released --- + +3560. [bug] isc-config.sh did not honor includedir and libdir + when set via configure. [RT #33345] + +3559. [func] Check that both forms of Sender Policy Framework + records exist or do not exist. [RT #33355] + +3558. [bug] IXFR of a DLZ stored zone was broken. [RT #33331] + +3556. [maint] Added AAAA for D.ROOT-SERVERS.NET. + +3555. [bug] Address theoretical race conditions in acache.c + (change #3553 was incomplete). [RT #33252] + +3553. [bug] Address suspected double free in acache. [RT #33252] + +3552. [bug] Wrong getopt option string for 'nsupdate -r'. + [RT #33280] + +3549. [doc] Documentation for "request-nsid" was missing. + [RT #33153] + +3548. [bug] The NSID request code in resolver.c was broken + resulting in invalid EDNS options being sent. + [RT #33153] + +3547. [bug] Some malformed unknown rdata records were not properly + detected and rejected. [RT #33129] + +3056. [func] Added support for URI resource record. [RT #23386] + + --- 9.8.5rc1 released --- + +3546. [func] Add EUI48 and EUI64 types. [RT #33082] + +3544. [contrib] check5011.pl: Script to report the status of + managed keys as recorded in managed-keys.bind. + Contributed by Tony Finch <dot@dotat.at> + +3543. [bug] Update socket structure before attaching to socket + manager after accept. [RT #33084] + +3542. [bug] masterformat system test was broken. [RT #33086] + +3541. [bug] Parts of libdns were not properly initialized when + built in libexport mode. [RT #33028] + +3540. [test] libt_api: t_info and t_assert were not thread safe. + +3539. [port] win32: timestamp format didn't match other platforms. + +3538. [test] Running "make test" now requires loopback interfaces + to be set up. [RT #32452] + +3537. [tuning] Slave zones, when updated, now send NOTIFY messages + to peers before being dumped to disk rather than + after. [RT #27242] + +3535. [bug] Minor win32 cleanups. [RT #32962] + +3534. [bug] Extra text after an embedded NULL was ignored when + parsing zone files. [RT #32699] + +3533. [contrib] query-loc-0.4.0: memory leaks. [RT #32960] + +3532. [contrib] zkt: fixed buffer overrun, resource leaks. [RT #32960] + +3531. [bug] win32: A uninitialized value could be returned on out + of memory. [RT #32960] + +3530. [contrib] Better RTT tracking in queryperf. [RT #30128] + +3526. [cleanup] Set up dependencies for unit tests correctly during + build. [RT #32803] + +3521. [bug] Address memory leak in opensslecdsa_link.c. [RT #32249] + +3520. [bug] 'mctx' was not being referenced counted in some places + where it should have been. [RT #32794] + + --- 9.8.5b2 released --- + +3517. [bug] Reorder destruction to avoid shutdown race. [RT #32777] + +3515. [port] '%T' is not portable in strftime(). [RT #32763] + +3514. [bug] The ranges for valid key sizes in ddns-confgen and + rndc-confgen were too constrained. Keys up to 512 + bits are now allowed for most algorithms, and up + to 1024 bits for hmac-sha384 and hmac-sha512. + [RT #32753] + +3509. [cleanup] Added a product line to version file to allow for + easy naming of different products (BIND + vs BIND ESV, for example). [RT #32755] + +3508. [contrib] queryperf was incorrectly rejecting the -T option. + [RT #32338] + +3503. [doc] Clarify size_spec syntax. [RT #32449] + +3500. [security] Support NAPTR regular expression validation on + all platforms without using libregex, which + can be vulnerable to memory exhaustion attack + (CVE-2013-2266). [RT #32688] + +3499. [doc] Corrected ARM documentation of built-in zones. + [RT #32694] + +3498. [bug] zone statistics for zones which matched a potential + empty zone could have their zone-statistics setting + overridden. + +3496. [func] Improvements to RPZ performance. The "response-policy" + syntax now includes a "min-ns-dots" clause, with + default 1, to exclude top-level domains from + NSIP and NSDNAME checking. --enable-rpz-nsip and + --enable-rpz-nsdname are now the default. [RT #32251] + +3489. [bug] --enable-developer now turns on ISC_LIST_CHECKINIT. + When cloning a rdataset do not copy the link contents. + [RT #32651] + +3488. [bug] Use after free error with DH generated keys. [RT #32649] + +3487. [bug] Change 3444 was not complete. There was a additional + place where the NOQNAME proof needed to be saved. + [RT #32629] + +3486. [bug] named could crash when using TKEY-negotiated keys + that had been deleted and then recreated. [RT #32506] + +3485. [cleanup] Only compile openssl_gostlink.c if we support GOST. + +3481. [cleanup] Removed use of const const in atf. + +3479. [bug] Address potential memory leaks in gssapi support + code. [RT #32405] + +3478. [port] Fix a build failure in strict C99 environments + [RT #32475] + +3474. [bug] nsupdate could assert when the local and remote + address families didn't match. [RT #22897] + +3470. [bug] Slave zones could fail to dump when successfully + refreshing after an initial failure. [RT #31276] + + --- 9.8.5b1 released --- + +3468. [security] RPZ rules to generate A records (but not AAAA records) + could trigger an assertion failure when used in + conjunction with DNS64 (CVE-2012-5689). [RT #32141] + +3467. [bug] Added checks in dnssec-keygen and dnssec-settime + to check for delete date < inactive date. [RT #31719] + +3465. [bug] Handle isolated reserved ports. [RT #31778] + +3464. [maint] Updates to PKCS#11 openssl patches, supporting + versions 0.9.8x, 1.0.0j, 1.0.1c [RT #29749] + +3463. [doc] Clarify managed-keys syntax in ARM. [RT #32232] + +3462. [doc] Clarify server selection behavior of dig when using + -4 or -6 options. [RT #32181] + +3461. [bug] Negative responses could incorrectly have AD=1 + set. [RT #32237] + +3458. [bug] Return FORMERR when presented with a overly long + domain named in a request. [RT #29682] + +3457. [protocol] Add ILNP records (NID, LP, L32, L64). [RT #31836] + +3456. [port] g++47: ATF failed to compile. [RT #32012] + +3455. [contrib] queryperf: fix getopt option list. [RT #32338] + +3454. [port] sparc64: improve atomic support. [RT #25182] + +3452. [bug] Accept duplicate singleton records. [RT #32329] + +3451. [port] Increase per thread stack size from 64K to 1M. + [RT #32230] + +3450. [bug] Stop logfileconfig system test spam system logs. + [RT #32315] + +3449. [bug] gen.c: use the pre-processor to construct format + strings so that compiler can perform sanity checks; + check the snprintf results. [RT #17576] + +3448. [bug] The allow-query-on ACL was not processed correctly. + [RT #29486] + +3447. [port] Add support for libxml2-2.9.x [RT #32231] + +3446. [port] win32: Add source ID (see change #3400) to build. + [RT #31683] + +3445. [bug] Warn about zone files with blank owner names + immediately after $ORIGIN directives. [RT #31848] + +3444. [bug] The NOQNAME proof was not being returned from cached + insecure responses. [RT #21409] + +3443. [bug] ddns-confgen: Some TSIG algorithms were incorrectly + rejected when generating keys. [RT #31927] + +3442. [port] Net::DNS 0.69 introduced a non backwards compatible + change. [RT #32216] + +3441. [maint] D.ROOT-SERVERS.NET is now 199.7.91.13. + +3440. [bug] Reorder get_key_struct to not trigger a assertion when + cleaning up due to out of memory error. [RT #32131] + +3439. [bug] contrib/dlz error checking fixes. [RT #32102] + +3438. [bug] Don't accept unknown data escape in quotes. [RT #32031] + +3437. [bug] isc_buffer_init -> isc_buffer_constinit to initialize + buffers with constant data. [RT #32064] + +3436. [bug] Check malloc/calloc return values. [RT #32088] + +3435. [bug] Cross compilation support in configure was broken. + [RT #32078] + +3431. [bug] ddns-confgen: Some valid key algorithms were + not accepted. [RT #31927] + +3430. [bug] win32: isc_time_formatISO8601 was missing the + 'T' between the date and time. [RT #32044] + +3429. [bug] dns_zone_getserial2 could a return success without + returning a valid serial. [RT #32007] + +3428. [cleanup] dig: Add timezone to date output. [RT #2269] + +3427. [bug] dig +trace incorrectly displayed name server + addresses instead of names. [RT #31641] + +3425. [bug] "acacheentry" reference counting was broken resulting + in use after free. [RT #31908] + +3422. [bug] Added a clear error message for when the SOA does not + match the referral. [RT #31281] + +3421. [bug] Named loops when re-signing if all keys are offline. + [RT #31916] + +3420. [bug] Address VPATH compilation issues. [RT #31879] + +3419. [bug] Memory leak on validation cancel. [RT #31869] + +3415. [bug] named could die with a REQUIRE failure if a validation + was canceled. [RT #31804] + +3412. [bug] Copy timeval structure from control message data. + [RT #31548] + +3411. [tuning] Use IPV6_USE_MIN_MTU or equivalent with TCP in addition + to UDP. [RT #31690] + +3410. [bug] Addressed Coverity warnings. [RT #31626] + +3409. [contrib] contrib/dane/mkdane.sh: Tool to generate TLSA RR's + from X.509 certificates, for use with DANE + (DNS-based Authentication of Named Entities). + [RT #30513] + +3406. [bug] mem.c: Fix compilation errors when building with + ISC_MEM_TRACKLINES or ISC_MEMPOOL_NAMES disabled. + Also, ISC_MEM_DEBUG is no longer optional. [RT #31559] + +3405. [bug] Handle time going backwards in acache. [RT #31253] + +3404. [bug] dnssec-signzone: When re-signing a zone, remove + RRSIG and NSEC records from nodes that used to be + in-zone but are now below a zone cut. [RT #31556] + +3403. [bug] Silence noisy OpenSSL logging. [RT #31497] + +3402. [test] The IPv6 interface numbers used for system + tests were incorrect on some platforms. [RT #25085] + +3401. [bug] Addressed Coverity warnings. [RT #31484] + +3400. [cleanup] "named -V" can now report a source ID string, defined + in the "srcid" file in the build tree and normally set + to the most recent git hash. [RT #31494] + +3397. [bug] dig crashed when using +nssearch with +tcp. [RT #25298] + +3396. [bug] OPT records were incorrectly removed from signed, + truncated responses. [RT #31439] + +3395. [protocol] Add RFC 6598 reverse zones to built in empty zones + list, 64.100.IN-ADDR.ARPA ... 127.100.IN-ADDR.ARPA. + [RT #31336] + +3394. [bug] Adjust 'successfully validated after lower casing + signer' log level and category. [RT #31414] + +3393. [bug] 'host -C' could core dump if REFUSED was received. + [RT #31381] + +3391. [bug] A DNSKEY lookup that encountered a CNAME failed. + [RT #31262] + +3390. [bug] Silence clang compiler warnings. [RT #30417] + +3389. [bug] Always return NOERROR (not 0) in TSIG. [RT #31275] + +3388. [bug] Fixed several Coverity warnings. + Note: This change includes a fix for a bug that + was subsequently determined to be an exploitable + security vulnerability, CVE-2012-5688: named could + die on specific queries with dns64 enabled. + [RT #30996] + +3386. [bug] Address locking violation when generating new NSEC / + NSEC3 chains. [RT #31224] + +3384. [bug] Improved logging of crypto errors. [RT #30963] 3383. [security] A certain combination of records in the RBT could - cause named to hang while populating the additional - section of a response. [RT #31090] + cause named to hang while populating the additional + section of a response. [RT #31090] + +3382. [bug] SOA query from slave used use-v6-udp-ports range, + if set, regardless of the address family in use. + [RT #24173] + +3381. [contrib] Update queryperf to support more RR types. + [RT #30762] + +3380. [bug] named could die if a nonexistent master list was + referenced in a also-notify. [RT #31004] + +3379. [bug] isc_interval_zero and isc_time_epoch should be + "const (type)* const". [RT #31069] + +3378. [bug] Handle missing 'managed-keys-directory' better. + [RT #30625] + +3376. [bug] Lack of EDNS support was being recorded without a + successful response. [RT #30811] + +3375. [func] Check that 'rndc dumpdb' works on a empty cache. + [RT #30808] + +3374. [bug] isc_parse_uint32 failed to return a range error on + systems with 64 bit longs. [RT #30232] + +3372. [bug] Silence spurious "deleted from unreachable cache" + messages. [RT #30501] + +3371. [bug] AD=1 should behave like DO=1 when deciding whether to + add NS RRsets to the additional section or not. + [RT #30479] + + --- 9.8.4 released --- 3373. [bug] win32: open raw files in binary mode. [RT #30944] @@ -135,11 +501,11 @@ --- 9.8.3 released --- 3318. [tuning] Reduce the amount of work performed while holding a - bucket lock when finshed with a fetch context. + bucket lock when finished with a fetch context. [RT #29239] -3314. [bug] The masters list could be updated while refesh_callback - and stub_callback were using it. [RT #26732] +3314. [bug] The masters list could be updated while stub_callback + or refresh_callback were using it. [RT #26732] 3313. [protocol] Add TLSA record type. [RT #28989] @@ -151,7 +517,7 @@ 3310. [test] Increase table size for mutex profiling. [RT #28809] -3309. [bug] resolver.c:fctx_finddone() was not threadsafe. +3309. [bug] resolver.c:fctx_finddone() was not thread safe. [RT #27995] 3307. [bug] Add missing ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS. @@ -328,7 +694,7 @@ 3234. [bug] 'make depend' produced invalid makefiles. [RT #26830] -3231. [bug] named could fail to send a uncompressable zone. +3231. [bug] named could fail to send a incompressible zone. [RT #26796] 3230. [bug] 'dig axfr' failed to properly handle a multi-message @@ -345,7 +711,7 @@ 3226. [bug] Address minor resource leakages. [RT #26624] -3221. [bug] Fixed a potential coredump on shutdown due to +3221. [bug] Fixed a potential core dump on shutdown due to referencing fetch context after it's been freed. [RT #26720] @@ -369,7 +735,7 @@ 3209. [func] Add "dnssec-lookaside 'no'". [RT #24858] -3208. [bug] 'dig -y' handle unknown tsig alorithm better. +3208. [bug] 'dig -y' handle unknown tsig algorithm better. [RT #25522] 3207. [contrib] Fixed build error in Berkeley DB DLZ module. [RT #26444] @@ -672,7 +1038,7 @@ 3077. [bug] zone.c:zone_refreshkeys() incorrectly called dns_zone_attach(), use zone->irefs instead. [RT #23303] -3075. [bug] dns_dnssec_findzonekeys{2} used a inconsistant +3075. [bug] dns_dnssec_findzonekeys{2} used a inconsistent timestamp when determining which keys are active. [RT #23642] @@ -686,7 +1052,7 @@ 3072. [bug] dns_dns64_aaaaok() potential NULL pointer dereference. [RT #20256] -3071. [bug] has_nsec could be used unintialised in +3071. [bug] has_nsec could be used uninitialized in update.c:next_active. [RT #20256] 3070. [bug] dnssec-signzone potential NULL pointer dereference. @@ -732,7 +1098,7 @@ 3052. [test] Fixed last autosign test report. [RT #23256] -3051. [bug] NS records obsure DNAME records at the bottom of the +3051. [bug] NS records obscure DNAME records at the bottom of the zone if both are present. [RT #23035] 3050. [bug] The autosign system test was timing dependent. @@ -742,7 +1108,7 @@ 3049. [bug] Save and restore the gid when creating creating named.pid at startup. [RT #23290] -3048. [bug] Fully separate view key mangement. [RT #23419] +3048. [bug] Fully separate view key management. [RT #23419] 3047. [bug] DNSKEY NODATA responses not cached fixed in validator.c. Tests added to dnssec system test. @@ -1079,7 +1445,7 @@ no data response. [RT #21744] 2952. [port] win32: named-checkzone and named-checkconf failed - to initialise winsock. [RT #21932] + to initialize winsock. [RT #21932] 2951. [bug] named failed to generate a correct signed response in a optout, delegation only zone with no secure @@ -1125,7 +1491,7 @@ in use. [RT# 21868] 2938. [bug] When generating signed responses, from a signed zone - that uses NSEC3, named would use a uninitialised + that uses NSEC3, named would use a uninitialized pointer if it needed to skip a NSEC3 record because it didn't match the selected NSEC3PARAM record for zone. [RT# 21868] @@ -1179,7 +1545,7 @@ revisit the issue and complete the fix later. [RT #21710] -2930. [experimental] New "rndc addzone" and "rndc delzone" commads +2930. [experimental] New "rndc addzone" and "rndc delzone" commands allow dynamic addition and deletion of zones. To enable this feature, specify a "new-zone-file" option at the view or options level in named.conf. @@ -1355,7 +1721,7 @@ successfully responds to the query using plain DNS. [RT #20930] -2873. [bug] Cancelling a dynamic update via the dns/client module +2873. [bug] Canceling a dynamic update via the dns/client module could trigger an assertion failure. [RT #21133] 2872. [bug] Modify dns/client.c:dns_client_createx() to only @@ -1397,7 +1763,7 @@ 2860. [bug] named-checkconf's usage was out of date. [RT #21039] -2859. [bug] When cancelling validation it was possible to leak +2859. [bug] When canceling validation it was possible to leak memory. [RT #20800] 2858. [bug] RTT estimates were not being adjusted on ICMP errors. @@ -1950,7 +2316,7 @@ 2695. [func] DHCP/DDNS - update fdwatch code for use by DHCP. Modify the api to isc_sockfdwatch_t (the - callback functon for isc_socket_fdwatchcreate) + callback function for isc_socket_fdwatchcreate) to include information about the direction (read or write) and add isc_socket_fdwatchpoke. [RT #20253] @@ -2015,7 +2381,7 @@ sets the time when a key is no longer used for signing but is still published. - The "unpublished" date (-U) is deprecated in - favour of "deleted" (-D). + favor of "deleted" (-D). [RT #20247] 2676. [bug] --with-export-installdir should have been @@ -2461,7 +2827,7 @@ 2553. [bug] Reference leak on DNSSEC validation errors. [RT #19291] -2552. [bug] zero-no-soa-ttl-cache was not being honoured. +2552. [bug] zero-no-soa-ttl-cache was not being honored. [RT #19340] 2551. [bug] Potential Reference leak on return. [RT #19341] @@ -2514,7 +2880,7 @@ 2534. [func] Check NAPTR records regular expressions and replacement strings to ensure they are syntactically - valid and consistant. [RT #18168] + valid and consistent. [RT #18168] 2533. [doc] ARM: document @ (at-sign). [RT #17144] Modified: vendor/bind9/dist/COPYRIGHT ============================================================================== --- vendor/bind9/dist/COPYRIGHT Wed Jul 24 06:13:00 2013 (r253591) +++ vendor/bind9/dist/COPYRIGHT Wed Jul 24 07:12:55 2013 (r253592) @@ -1,4 +1,4 @@ -Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC") +Copyright (C) 2004-2013 Internet Systems Consortium, Inc. ("ISC") Copyright (C) 1996-2003 Internet Software Consortium. Permission to use, copy, modify, and/or distribute this software for any Modified: vendor/bind9/dist/FAQ ============================================================================== --- vendor/bind9/dist/FAQ Wed Jul 24 06:13:00 2013 (r253591) +++ vendor/bind9/dist/FAQ Wed Jul 24 07:12:55 2013 (r253592) @@ -1,6 +1,6 @@ Frequently Asked Questions about BIND 9 -Copyright © 2004-2010 Internet Systems Consortium, Inc. ("ISC") +Copyright © 2004-2010, 2013 Internet Systems Consortium, Inc. ("ISC") Copyright © 2000-2003 Internet Software Consortium. @@ -869,7 +869,7 @@ A: If you run Tiger(Mac OS 10.4) or late Copy the key statement from /etc/rndc.conf into /etc/rndc.key, e.g.: key "rndc-key" { - algorithm hmac-md5; + algorithm hmac-sha256; secret "uvceheVuqf17ZwIcTydddw=="; }; Modified: vendor/bind9/dist/FAQ.xml ============================================================================== --- vendor/bind9/dist/FAQ.xml Wed Jul 24 06:13:00 2013 (r253591) +++ vendor/bind9/dist/FAQ.xml Wed Jul 24 07:12:55 2013 (r253592) @@ -1,7 +1,7 @@ <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" []> <!-- - - Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") + - Copyright (C) 2004-2010, 2013 Internet Systems Consortium, Inc. ("ISC") - Copyright (C) 2000-2003 Internet Software Consortium. - - Permission to use, copy, modify, and/or distribute this software for any @@ -30,6 +30,7 @@ <year>2008</year> <year>2009</year> <year>2010</year> + <year>2013</year> <holder>Internet Systems Consortium, Inc. ("ISC")</holder> </copyright> <copyright> @@ -1564,7 +1565,7 @@ rand_irqs="3 14 15"</programlisting> <informalexample> <programlisting> key "rndc-key" { - algorithm hmac-md5; + algorithm hmac-sha256; secret "uvceheVuqf17ZwIcTydddw=="; };</programlisting> </informalexample> Modified: vendor/bind9/dist/Makefile.in ============================================================================== --- vendor/bind9/dist/Makefile.in Wed Jul 24 06:13:00 2013 (r253591) +++ vendor/bind9/dist/Makefile.in Wed Jul 24 07:12:55 2013 (r253592) @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2009, 2011-2013 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2002 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -61,9 +61,21 @@ tags: rm -f TAGS find lib bin -name "*.[ch]" -print | @ETAGS@ - -check: test +test check: + @if test -n "`${PERL} ${top_srcdir}/bin/tests/system/testsock.pl 2>&- || echo fail`"; then \ + echo I: NOTE: The tests were not run because they require that; \ + echo I: the IP addresses 10.53.0.1 through 10.53.0.8 are configured; \ + echo I: as alias addresses on the loopback interface. Please run; \ + echo I: \'bin/tests/system/ifconfig.sh up\' as root to configure; \ + echo I: them, then rerun the tests. Run make force-test to run the; \ + echo I: tests anyway.; \ + exit 1; \ + fi + ${MAKE} test-force -test: +force-test: test-force + +test-force: status=0; \ (cd bin/tests && ${MAKE} ${MAKEDEFS} test) || status=1; \ (test -f unit/unittest.sh && $(SHELL) unit/unittest.sh) || status=1; \ Modified: vendor/bind9/dist/README ============================================================================== --- vendor/bind9/dist/README Wed Jul 24 06:13:00 2013 (r253591) +++ vendor/bind9/dist/README Wed Jul 24 07:12:55 2013 (r253592) @@ -51,6 +51,11 @@ BIND 9 For up-to-date release notes and errata, see http://www.isc.org/software/bind9/releasenotes +BIND 9.8.5 + + BIND 9.8.5 includes several bug fixes and patches security + flaws described in CVE-2012-5688, CVE-2012-5689 and CVE-2013-2266. + BIND 9.8.4 BIND 9.8.4 includes several bug fixes and patches security Modified: vendor/bind9/dist/aclocal.m4 ============================================================================== --- vendor/bind9/dist/aclocal.m4 Wed Jul 24 06:13:00 2013 (r253591) +++ vendor/bind9/dist/aclocal.m4 Wed Jul 24 07:12:55 2013 (r253592) @@ -1,2 +1,5 @@ -sinclude(./libtool.m4)dnl - +sinclude(libtool.m4/libtool.m4)dnl +sinclude(libtool.m4/ltoptions.m4)dnl +sinclude(libtool.m4/ltsugar.m4)dnl +sinclude(libtool.m4/ltversion.m4)dnl +sinclude(libtool.m4/lt~obsolete.m4)dnl Modified: vendor/bind9/dist/bin/Makefile.in ============================================================================== --- vendor/bind9/dist/bin/Makefile.in Wed Jul 24 06:13:00 2013 (r253591) +++ vendor/bind9/dist/bin/Makefile.in Wed Jul 24 07:12:55 2013 (r253592) @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007, 2009, 2012 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2009, 2012, 2013 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -19,7 +19,7 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -SUBDIRS = named rndc dig dnssec tests tools nsupdate \ +SUBDIRS = named rndc dig dnssec tools tests nsupdate \ check confgen @PKCS11_TOOLS@ TARGETS = Modified: vendor/bind9/dist/bin/check/check-tool.c ============================================================================== --- vendor/bind9/dist/bin/check/check-tool.c Wed Jul 24 06:13:00 2013 (r253591) +++ vendor/bind9/dist/bin/check/check-tool.c Wed Jul 24 07:12:55 2013 (r253592) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2010, 2012 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -196,6 +196,10 @@ checkns(dns_zone_t *zone, dns_name_t *na a->type == dns_rdatatype_a); REQUIRE(aaaa == NULL || !dns_rdataset_isassociated(aaaa) || aaaa->type == dns_rdatatype_aaaa); + + if (a == NULL || aaaa == NULL) + return (answer); + memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_CANONNAME; hints.ai_family = PF_UNSPEC; @@ -258,8 +262,7 @@ checkns(dns_zone_t *zone, dns_name_t *na } return (ISC_TRUE); } - if (a == NULL || aaaa == NULL) - return (answer); + /* * Check that all glue records really exist. */ @@ -597,7 +600,7 @@ load_zone(isc_mem_t *mctx, const char *z dns_zone_settype(zone, dns_zone_master); - isc_buffer_init(&buffer, zonename, strlen(zonename)); + isc_buffer_constinit(&buffer, zonename, strlen(zonename)); isc_buffer_add(&buffer, strlen(zonename)); dns_fixedname_init(&fixorigin); origin = dns_fixedname_name(&fixorigin); Modified: vendor/bind9/dist/bin/check/named-checkconf.c ============================================================================== --- vendor/bind9/dist/bin/check/named-checkconf.c Wed Jul 24 06:13:00 2013 (r253591) +++ vendor/bind9/dist/bin/check/named-checkconf.c Wed Jul 24 07:12:55 2013 (r253592) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007, 2009-2011 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009-2013 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -295,6 +295,18 @@ configure_zone(const char *vclass, const } obj = NULL; + if (get_maps(maps, "check-spf", &obj)) { + if (strcasecmp(cfg_obj_asstring(obj), "warn") == 0) { + zone_options |= DNS_ZONEOPT_CHECKSPF; + } else if (strcasecmp(cfg_obj_asstring(obj), "ignore") == 0) { + zone_options &= ~DNS_ZONEOPT_CHECKSPF; + } else + INSIST(0); + } else { + zone_options |= DNS_ZONEOPT_CHECKSPF; + } + + obj = NULL; if (get_checknames(maps, &obj)) { if (strcasecmp(cfg_obj_asstring(obj), "warn") == 0) { zone_options |= DNS_ZONEOPT_CHECKNAMES; @@ -471,6 +483,7 @@ main(int argc, char **argv) { if (isc_commandline_option != '?') fprintf(stderr, "%s: invalid argument -%c\n", program, isc_commandline_option); + /* FALLTHROUGH */ case 'h': usage(); Modified: vendor/bind9/dist/bin/check/named-checkzone.8 ============================================================================== --- vendor/bind9/dist/bin/check/named-checkzone.8 Wed Jul 24 06:13:00 2013 (r253591) +++ vendor/bind9/dist/bin/check/named-checkzone.8 Wed Jul 24 07:12:55 2013 (r253592) @@ -1,4 +1,4 @@ -.\" Copyright (C) 2004-2007, 2009, 2010 Internet Systems Consortium, Inc. ("ISC") +.\" Copyright (C) 2004-2007, 2009, 2010, 2013 Internet Systems Consortium, Inc. ("ISC") .\" Copyright (C) 2000-2002 Internet Software Consortium. .\" .\" Permission to use, copy, modify, and/or distribute this software for any @@ -33,9 +33,9 @@ named\-checkzone, named\-compilezone \- zone file validity checking or converting tool .SH "SYNOPSIS" .HP 16 -\fBnamed\-checkzone\fR [\fB\-d\fR] [\fB\-h\fR] [\fB\-j\fR] [\fB\-q\fR] [\fB\-v\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-f\ \fR\fB\fIformat\fR\fR] [\fB\-F\ \fR\fB\fIformat\fR\fR] [\fB\-i\ \fR\fB\fImode\fR\fR] [\fB\-k\ \fR\fB\fImode\fR\fR] [\fB\-m\ \fR\fB\fImode\fR\fR] [\fB\-M\ \fR\fB\fImode\fR\fR] [\fB\-n\ \fR\fB\fImode\fR\fR] [\fB\-o\ \fR\fB\fIfilename\fR\fR] [\fB\-r\ \fR\fB\fImode\fR\fR] [\fB\-s\ \fR\fB\fIstyle\fR\fR] [\fB\-S\ \fR\fB\fImode\fR\fR] [\fB\-t\ \fR\fB\fIdirectory\fR\fR] [\fB\-w\ \fR\fB\fIdirectory\fR\fR] [\fB\-D\fR] [\fB\-W\ \fR\fB\fImode\fR\fR] {zonename} {filename} +\fBnamed\-checkzone\fR [\fB\-d\fR] [\fB\-h\fR] [\fB\-j\fR] [\fB\-q\fR] [\fB\-v\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-f\ \fR\fB\fIformat\fR\fR] [\fB\-F\ \fR\fB\fIformat\fR\fR] [\fB\-i\ \fR\fB\fImode\fR\fR] [\fB\-k\ \fR\fB\fImode\fR\fR] [\fB\-m\ \fR\fB\fImode\fR\fR] [\fB\-M\ \fR\fB\fImode\fR\fR] [\fB\-n\ \fR\fB\fImode\fR\fR] [\fB\-o\ \fR\fB\fIfilename\fR\fR] [\fB\-r\ \fR\fB\fImode\fR\fR] [\fB\-s\ \fR\fB\fIstyle\fR\fR] [\fB\-S\ \fR\fB\fImode\fR\fR] [\fB\-t\ \fR\fB\fIdirectory\fR\fR] [\fB\-T\ \fR\fB\fImode\fR\fR] [\fB\-w\ \fR\fB\fIdirectory\fR\fR] [\fB\-D\fR] [\fB\-W\ \fR\fB\fImode\fR\fR] {zonename} {filename} .HP 18 -\fBnamed\-compilezone\fR [\fB\-d\fR] [\fB\-j\fR] [\fB\-q\fR] [\fB\-v\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-C\ \fR\fB\fImode\fR\fR] [\fB\-f\ \fR\fB\fIformat\fR\fR] [\fB\-F\ \fR\fB\fIformat\fR\fR] [\fB\-i\ \fR\fB\fImode\fR\fR] [\fB\-k\ \fR\fB\fImode\fR\fR] [\fB\-m\ \fR\fB\fImode\fR\fR] [\fB\-n\ \fR\fB\fImode\fR\fR] [\fB\-r\ \fR\fB\fImode\fR\fR] [\fB\-s\ \fR\fB\fIstyle\fR\fR] [\fB\-t\ \fR\fB\fIdirectory\fR\fR] [\fB\-w\ \fR\fB\fIdirectory\fR\fR] [\fB\-D\fR] [\fB\-W\ \fR\fB\fImode\fR\fR] {\fB\-o\ \fR\fB\fIfilename\fR\fR} {zonename} {filename} +\fBnamed\-compilezone\fR [\fB\-d\fR] [\fB\-j\fR] [\fB\-q\fR] [\fB\-v\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-C\ \fR\fB\fImode\fR\fR] [\fB\-f\ \fR\fB\fIformat\fR\fR] [\fB\-F\ \fR\fB\fIformat\fR\fR] [\fB\-i\ \fR\fB\fImode\fR\fR] [\fB\-k\ \fR\fB\fImode\fR\fR] [\fB\-m\ \fR\fB\fImode\fR\fR] [\fB\-n\ \fR\fB\fImode\fR\fR] [\fB\-r\ \fR\fB\fImode\fR\fR] [\fB\-s\ \fR\fB\fIstyle\fR\fR] [\fB\-t\ \fR\fB\fIdirectory\fR\fR] [\fB\-T\ \fR\fB\fImode\fR\fR] [\fB\-w\ \fR\fB\fIdirectory\fR\fR] [\fB\-D\fR] [\fB\-W\ \fR\fB\fImode\fR\fR] {\fB\-o\ \fR\fB\fIfilename\fR\fR} {zonename} {filename} .SH "DESCRIPTION" .PP \fBnamed\-checkzone\fR @@ -236,6 +236,14 @@ Chroot to so that include directives in the configuration file are processed as if run by a similarly chrooted named. .RE .PP +\-T \fImode\fR +.RS 4 +Check if Sender Policy Framework records (TXT and SPF) both exist or both don't exist. A warning is issued if they don't match. Possible modes are +\fB"warn"\fR +(default), +\fB"ignore"\fR. +.RE +.PP \-w \fIdirectory\fR .RS 4 chdir to @@ -281,7 +289,7 @@ BIND 9 Administrator Reference Manual. .PP Internet Systems Consortium .SH "COPYRIGHT" -Copyright \(co 2004\-2007, 2009, 2010 Internet Systems Consortium, Inc. ("ISC") +Copyright \(co 2004\-2007, 2009, 2010, 2013 Internet Systems Consortium, Inc. ("ISC") .br Copyright \(co 2000\-2002 Internet Software Consortium. .br Modified: vendor/bind9/dist/bin/check/named-checkzone.c ============================================================================== --- vendor/bind9/dist/bin/check/named-checkzone.c Wed Jul 24 06:13:00 2013 (r253591) +++ vendor/bind9/dist/bin/check/named-checkzone.c Wed Jul 24 07:12:55 2013 (r253592) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2013 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -145,19 +145,21 @@ main(int argc, char **argv) { if (progmode == progmode_compile) { zone_options |= (DNS_ZONEOPT_CHECKNS | DNS_ZONEOPT_FATALNS | + DNS_ZONEOPT_CHECKSPF | DNS_ZONEOPT_CHECKDUPRR | DNS_ZONEOPT_CHECKNAMES | DNS_ZONEOPT_CHECKNAMESFAIL | DNS_ZONEOPT_CHECKWILDCARD); } else - zone_options |= DNS_ZONEOPT_CHECKDUPRR; + zone_options |= (DNS_ZONEOPT_CHECKDUPRR | + DNS_ZONEOPT_CHECKSPF); #define ARGCMP(X) (strcmp(isc_commandline_argument, X) == 0) isc_commandline_errprint = ISC_FALSE; while ((c = isc_commandline_parse(argc, argv, - "c:df:hi:jk:m:n:qr:s:t:o:vw:DF:M:S:W:")) + "c:df:hi:jk:m:n:qr:s:t:o:vw:DF:M:S:T:W:")) != EOF) { switch (c) { case 'c': @@ -363,6 +365,18 @@ main(int argc, char **argv) { } break; + case 'T': + if (ARGCMP("warn")) { + zone_options |= DNS_ZONEOPT_CHECKSPF; + } else if (ARGCMP("ignore")) { + zone_options &= ~DNS_ZONEOPT_CHECKSPF; + } else { + fprintf(stderr, "invalid argument to -T: %s\n", + isc_commandline_argument); + exit(1); + } + break; + case 'W': if (ARGCMP("warn")) zone_options |= DNS_ZONEOPT_CHECKWILDCARD; @@ -374,6 +388,7 @@ main(int argc, char **argv) { if (isc_commandline_option != '?') fprintf(stderr, "%s: invalid argument -%c\n", prog_name, isc_commandline_option); + /* FALLTHROUGH */ case 'h': usage(); Modified: vendor/bind9/dist/bin/check/named-checkzone.docbook ============================================================================== --- vendor/bind9/dist/bin/check/named-checkzone.docbook Wed Jul 24 06:13:00 2013 (r253591) +++ vendor/bind9/dist/bin/check/named-checkzone.docbook Wed Jul 24 07:12:55 2013 (r253592) @@ -2,7 +2,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [<!ENTITY mdash "—">]> <!-- - - Copyright (C) 2004-2007, 2009, 2010 Internet Systems Consortium, Inc. ("ISC") + - Copyright (C) 2004-2007, 2009, 2010, 2013 Internet Systems Consortium, Inc. ("ISC") - Copyright (C) 2000-2002 Internet Software Consortium. - - Permission to use, copy, modify, and/or distribute this software for any @@ -38,6 +38,7 @@ <year>2007</year> <year>2009</year> <year>2010</year> + <year>2013</year> <holder>Internet Systems Consortium, Inc. ("ISC")</holder> </copyright> <copyright> @@ -75,6 +76,7 @@ <arg><option>-s <replaceable class="parameter">style</replaceable></option></arg> <arg><option>-S <replaceable class="parameter">mode</replaceable></option></arg> <arg><option>-t <replaceable class="parameter">directory</replaceable></option></arg> + <arg><option>-T <replaceable class="parameter">mode</replaceable></option></arg> <arg><option>-w <replaceable class="parameter">directory</replaceable></option></arg> <arg><option>-D</option></arg> <arg><option>-W <replaceable class="parameter">mode</replaceable></option></arg> @@ -98,6 +100,7 @@ <arg><option>-r <replaceable class="parameter">mode</replaceable></option></arg> <arg><option>-s <replaceable class="parameter">style</replaceable></option></arg> <arg><option>-t <replaceable class="parameter">directory</replaceable></option></arg> + <arg><option>-T <replaceable class="parameter">mode</replaceable></option></arg> <arg><option>-w <replaceable class="parameter">directory</replaceable></option></arg> <arg><option>-D</option></arg> <arg><option>-W <replaceable class="parameter">mode</replaceable></option></arg> @@ -380,6 +383,18 @@ </varlistentry> <varlistentry> + <term>-T <replaceable class="parameter">mode</replaceable></term> + <listitem> + <para> + Check if Sender Policy Framework records (TXT and SPF) + both exist or both don't exist. A warning is issued + if they don't match. Possible modes are + <command>"warn"</command> (default), <command>"ignore"</command>. + </para> + </listitem> + </varlistentry> + + <varlistentry> <term>-w <replaceable class="parameter">directory</replaceable></term> <listitem> <para> Modified: vendor/bind9/dist/bin/check/named-checkzone.html ============================================================================== --- vendor/bind9/dist/bin/check/named-checkzone.html Wed Jul 24 06:13:00 2013 (r253591) +++ vendor/bind9/dist/bin/check/named-checkzone.html Wed Jul 24 07:12:55 2013 (r253592) @@ -1,5 +1,5 @@ <!-- - - Copyright (C) 2004-2007, 2009, 2010 Internet Systems Consortium, Inc. ("ISC") + - Copyright (C) 2004-2007, 2009, 2010, 2013 Internet Systems Consortium, Inc. ("ISC") - Copyright (C) 2000-2002 Internet Software Consortium. - - Permission to use, copy, modify, and/or distribute this software for any @@ -29,11 +29,11 @@ </div> <div class="refsynopsisdiv"> <h2>Synopsis</h2> -<div class="cmdsynopsis"><p><code class="command">named-checkzone</code> [<code class="option">-d</code>] [<code class="option">-h</code>] [<code class="option">-j</code>] [<code class="option">-q</code>] [<code class="option">-v</code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-f <em class="replaceable"><code>format</code></em></code>] [<code class="option">-F <em class="replaceable"><code>format</code></em></code>] [<code class="option">-i <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-k <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-m <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-M <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-n <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-o <em class="replaceable"><code>filename</code></em></code>] [<code class="option">-r <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-s <em class="replaceable"><code>style</code></em></code>] [<code class="option">-S <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-t <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-w <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-D</code>] [<code class="option">-W <em class="replaceable"><code>mode</code></em></code>] {zonename} {filename}</p></div> -<div class="cmdsynopsis"><p><code class="command">named-compilezone</code> [<code class="option">-d</code>] [<code class="option">-j</code>] [<code class="option">-q</code>] [<code class="option">-v</code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-C <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-f <em class="replaceable"><code>format</code></em></code>] [<code class="option">-F <em class="replaceable"><code>format</code></em></code>] [<code class="option">-i <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-k <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-m <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-n <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-r <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-s <em class="replaceable"><code>style</co de></em></code>] [<code class="option">-t <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-w <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-D</code>] [<code class="option">-W <em class="replaceable"><code>mode</code></em></code>] {<code class="option">-o <em class="replaceable"><code>filename</code></em></code>} {zonename} {filename}</p></div> +<div class="cmdsynopsis"><p><code class="command">named-checkzone</code> [<code class="option">-d</code>] [<code class="option">-h</code>] [<code class="option">-j</code>] [<code class="option">-q</code>] [<code class="option">-v</code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-f <em class="replaceable"><code>format</code></em></code>] [<code class="option">-F <em class="replaceable"><code>format</code></em></code>] [<code class="option">-i <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-k <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-m <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-M <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-n <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-o <em class="replaceable"><code>filename</code></em></code>] [<code class="option">-r <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-s <em class="replaceable"><code>style</code></em></code>] [<code class="option">-S <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-t <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-T <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-w <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-D</code>] [<code class="option">-W <em class="replaceable"><code>mode</code></em></code>] {zonename} {filename}</p></div> +<div class="cmdsynopsis"><p><code class="command">named-compilezone</code> [<code class="option">-d</code>] [<code class="option">-j</code>] [<code class="option">-q</code>] [<code class="option">-v</code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-C <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-f <em class="replaceable"><code>format</code></em></code>] [<code class="option">-F <em class="replaceable"><code>format</code></em></code>] [<code class="option">-i <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-k <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-m <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-n <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-r <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-s <em class="replaceable"><code>style</co de></em></code>] [<code class="option">-t <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-T <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-w <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-D</code>] [<code class="option">-W <em class="replaceable"><code>mode</code></em></code>] {<code class="option">-o <em class="replaceable"><code>filename</code></em></code>} {zonename} {filename}</p></div> </div> <div class="refsect1" lang="en"> -<a name="id2543696"></a><h2>DESCRIPTION</h2> +<a name="id2543716"></a><h2>DESCRIPTION</h2> <p><span><strong class="command">named-checkzone</strong></span> checks the syntax and integrity of a zone file. It performs the same checks as <span><strong class="command">named</strong></span> does when loading a @@ -53,7 +53,7 @@ </p> </div> <div class="refsect1" lang="en"> -<a name="id2543731"></a><h2>OPTIONS</h2> +<a name="id2543751"></a><h2>OPTIONS</h2> <div class="variablelist"><dl> <dt><span class="term">-d</span></dt> <dd><p> @@ -214,6 +214,13 @@ directives in the configuration file are processed as if run by a similarly chrooted named. </p></dd> +<dt><span class="term">-T <em class="replaceable"><code>mode</code></em></span></dt> +<dd><p> + Check if Sender Policy Framework records (TXT and SPF) + both exist or both don't exist. A warning is issued + if they don't match. Possible modes are + <span><strong class="command">"warn"</strong></span> (default), <span><strong class="command">"ignore"</strong></span>. + </p></dd> <dt><span class="term">-w <em class="replaceable"><code>directory</code></em></span></dt> <dd><p> chdir to <code class="filename">directory</code> so that @@ -247,14 +254,14 @@ </dl></div> </div> <div class="refsect1" lang="en"> -<a name="id2544446"></a><h2>RETURN VALUES</h2> +<a name="id2544422"></a><h2>RETURN VALUES</h2> <p><span><strong class="command">named-checkzone</strong></span> returns an exit status of 1 if errors were detected and 0 otherwise. </p> </div> <div class="refsect1" lang="en"> -<a name="id2544458"></a><h2>SEE ALSO</h2> +<a name="id2544434"></a><h2>SEE ALSO</h2> <p><span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>, <span class="citerefentry"><span class="refentrytitle">named-checkconf</span>(8)</span>, <em class="citetitle">RFC 1035</em>, @@ -262,7 +269,7 @@ </p> </div> <div class="refsect1" lang="en"> -<a name="id2544491"></a><h2>AUTHOR</h2> +<a name="id2544603"></a><h2>AUTHOR</h2> <p><span class="corpauthor">Internet Systems Consortium</span> *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-vendor@FreeBSD.ORG Wed Jul 24 07:15:09 2013 Return-Path: <owner-svn-src-vendor@FreeBSD.ORG> Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id ABDE7DA1; Wed, 24 Jul 2013 07:15:09 +0000 (UTC) (envelope-from erwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8399C2DB7; Wed, 24 Jul 2013 07:15:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6O7F973053494; Wed, 24 Jul 2013 07:15:09 GMT (envelope-from erwin@svn.freebsd.org) Received: (from erwin@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6O7F93Z053493; Wed, 24 Jul 2013 07:15:09 GMT (envelope-from erwin@svn.freebsd.org) Message-Id: <201307240715.r6O7F93Z053493@svn.freebsd.org> From: Erwin Lansing <erwin@FreeBSD.org> Date: Wed, 24 Jul 2013 07:15:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r253593 - vendor/bind9/9.8.5-P1 X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree <svn-src-vendor.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>, <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor> List-Post: <mailto:svn-src-vendor@freebsd.org> List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>, <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 24 Jul 2013 07:15:09 -0000 Author: erwin Date: Wed Jul 24 07:15:08 2013 New Revision: 253593 URL: http://svnweb.freebsd.org/changeset/base/253593 Log: Tag the 9.8.5-P1 release Added: vendor/bind9/9.8.5-P1/ - copied from r253592, vendor/bind9/dist/ From owner-svn-src-vendor@FreeBSD.ORG Fri Jul 26 18:20:01 2013 Return-Path: <owner-svn-src-vendor@FreeBSD.ORG> Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D7B4DF36; Fri, 26 Jul 2013 18:20:00 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C272A2A05; Fri, 26 Jul 2013 18:20:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6QIK0k4046041; Fri, 26 Jul 2013 18:20:00 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6QIK0Bd046039; Fri, 26 Jul 2013 18:20:00 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201307261820.r6QIK0Bd046039@svn.freebsd.org> From: Jung-uk Kim <jkim@FreeBSD.org> Date: Fri, 26 Jul 2013 18:20:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r253681 - in vendor-sys/acpica/dist: . generate/unix source/common source/compiler source/components/executer source/components/hardware source/components/namespace source/components/ta... X-SVN-Group: vendor-sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree <svn-src-vendor.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>, <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor> List-Post: <mailto:svn-src-vendor@freebsd.org> List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>, <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 26 Jul 2013 18:20:01 -0000 Author: jkim Date: Fri Jul 26 18:20:00 2013 New Revision: 253681 URL: http://svnweb.freebsd.org/changeset/base/253681 Log: Import ACPICA 20130725. Modified: vendor-sys/acpica/dist/changes.txt vendor-sys/acpica/dist/generate/unix/Makefile.common vendor-sys/acpica/dist/generate/unix/Makefile.config vendor-sys/acpica/dist/source/common/dmextern.c vendor-sys/acpica/dist/source/common/getopt.c vendor-sys/acpica/dist/source/compiler/asloffset.c vendor-sys/acpica/dist/source/compiler/asloperands.c vendor-sys/acpica/dist/source/compiler/asloptions.c vendor-sys/acpica/dist/source/compiler/dttemplate.c vendor-sys/acpica/dist/source/components/executer/exoparg1.c vendor-sys/acpica/dist/source/components/hardware/hwtimer.c vendor-sys/acpica/dist/source/components/namespace/nspredef.c vendor-sys/acpica/dist/source/components/namespace/nswalk.c vendor-sys/acpica/dist/source/components/namespace/nsxfeval.c vendor-sys/acpica/dist/source/components/tables/tbfadt.c vendor-sys/acpica/dist/source/components/tables/tbxfroot.c vendor-sys/acpica/dist/source/components/utilities/utglobal.c vendor-sys/acpica/dist/source/components/utilities/utosi.c vendor-sys/acpica/dist/source/components/utilities/utxface.c vendor-sys/acpica/dist/source/include/acglobal.h vendor-sys/acpica/dist/source/include/aclocal.h vendor-sys/acpica/dist/source/include/acnamesp.h vendor-sys/acpica/dist/source/include/acpixf.h vendor-sys/acpica/dist/source/include/actables.h vendor-sys/acpica/dist/source/include/actypes.h vendor-sys/acpica/dist/source/include/acutils.h vendor-sys/acpica/dist/source/include/platform/acfreebsd.h vendor-sys/acpica/dist/source/os_specific/service_layers/osfreebsdtbl.c vendor-sys/acpica/dist/source/os_specific/service_layers/oslinuxtbl.c vendor-sys/acpica/dist/source/tools/acpiexec/aetables.c vendor-sys/acpica/dist/source/tools/acpiexec/aetables.h Modified: vendor-sys/acpica/dist/changes.txt ============================================================================== --- vendor-sys/acpica/dist/changes.txt Fri Jul 26 15:53:43 2013 (r253680) +++ vendor-sys/acpica/dist/changes.txt Fri Jul 26 18:20:00 2013 (r253681) @@ -1,4 +1,76 @@ ---------------------------------------- +25 July 2013. Summary of changes for version 20130725: + +1) ACPICA kernel-resident subsystem: + +Fixed a problem with the DerefOf operator where references to FieldUnits +and BufferFields incorrectly returned the parent object, not the actual +value of the object. After this change, a dereference of a FieldUnit +reference results in a read operation on the field to get the value, and +likewise, the appropriate BufferField value is extracted from the target +buffer. + +Fixed a problem where the _WAK method could cause a fault under these +circumstances: 1) Interpreter slack mode was not enabled, and 2) the _WAK +method returned no value. The problem is rarely seen because most kernels +run ACPICA in slack mode. + +For the DerefOf operator, a fatal error now results if an attempt is made +to dereference a reference (created by the Index operator) to a NULL +package element. Provides compatibility with other ACPI implementations, +and this behavior will be added to a future version of the ACPI +specification. + +The ACPI Power Management Timer (defined in the FADT) is now optional. +This provides compatibility with other ACPI implementations and will +appear in the next version of the ACPI specification. If there is no PM +Timer on the platform, AcpiGetTimer returns AE_SUPPORT. An address of +zero in the FADT indicates no PM timer. + +Implemented a new interface for _OSI support, AcpiUpdateInterfaces. This +allows the host to globally enable/disable all vendor strings, all +feature strings, or both. Intended to be primarily used for debugging +purposes only. Lv Zheng. + +Expose the collected _OSI data to the host via a global variable. This +data tracks the highest level vendor ID that has been invoked by the BIOS +so that the host (and potentially ACPICA itself) can change behaviors +based upon the age of the BIOS. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. + + Current Release: + Non-Debug Version: 96.2K Code, 27.1K Data, 123.3K Total + Debug Version: 184.4K Code, 76.8K Data, 261.2K Total + Previous Release: + Non-Debug Version: 95.9K Code, 26.9K Data, 122.8K Total + Debug Version: 184.1K Code, 76.7K Data, 260.8K Total + + +2) iASL Compiler/Disassembler and Tools: + +iASL: Created the following enhancements for the -so option (create +offset table): +1)Add offsets for the last nameseg in each namepath for every supported +object type +2)Add support for Processor, Device, Thermal Zone, and Scope objects +3)Add the actual AML opcode for the parent object of every supported +object type +4)Add support for the ZERO/ONE/ONES AML opcodes for integer objects + +Disassembler: Emit all unresolved external symbols in a single block. +These are external references to control methods that could not be +resolved, and thus, the disassembler had to make a guess at the number of +arguments to parse. + +iASL: The argument to the -T option (create table template) is now +optional. If not specified, the default table is a DSDT, typically the +most common case. + +---------------------------------------- 26 June 2013. Summary of changes for version 20130626: 1) ACPICA kernel-resident subsystem: @@ -65,12 +137,14 @@ longer executed properly because of a me initialized correctly. ACPICA BZ 1016. Tomasz Nowicki <tomasz.nowicki@linaro.org>. -Fixed a possible problem with the new extended sleep registers in the ACPI +Fixed a possible problem with the new extended sleep registers in the +ACPI 5.0 FADT. Do not use these registers (even if populated) unless the HW- reduced bit is set in the FADT (as per the ACPI specification). ACPICA BZ 1020. Lv Zheng. -Implemented return value repair code for _CST predefined objects: Sort the +Implemented return value repair code for _CST predefined objects: Sort +the list and detect/remove invalid entries. ACPICA BZ 890. Lv Zheng. Implemented a debug-only option to disable loading of SSDTs from the @@ -87,7 +161,8 @@ BZ 1013. 4) Clear debug buffer global on termination to prevent possible multiple delete. ACPICA BZ 1010. -Standardized all switch() blocks across the entire source base. After many +Standardized all switch() blocks across the entire source base. After +many years, different formatting for switch() had crept in. This change makes the formatting of every switch block identical. ACPICA BZ 997. Chao Guan. @@ -118,7 +193,8 @@ has a much larger code and data size. 2) iASL Compiler/Disassembler and Tools: New utility: Implemented an easily portable version of the acpidump -utility to extract ACPI tables from the system (or a file) in an ASCII hex +utility to extract ACPI tables from the system (or a file) in an ASCII +hex dump format. The top-level code implements the various command line options, file I/O, and table dump routines. To port to a new host, only three functions need to be implemented to get tables -- since this @@ -152,7 +228,8 @@ iASL: Added control method and package s iASL: issue a remark if a non-serialized method creates named objects. If a thread blocks within the method for any reason, and another thread -enters the method, the method will fail because an attempt will be made to +enters the method, the method will fail because an attempt will be made +to create the same (named) object twice. In this case, issue a remark that the method should be marked serialized. NOTE: may become a warning later. ACPICA BZ 909. @@ -165,10 +242,13 @@ ACPICA BZ 909. Fixed a possible buffer overrun during some rare but specific field unit read operations. This overrun can only happen if the DSDT version is 1 -- meaning that all AML integers are 32 bits -- and the field length is -between 33 and 55 bits long. During the read, an internal buffer object is -created for the field unit because the field is larger than an integer (32 +between 33 and 55 bits long. During the read, an internal buffer object +is +created for the field unit because the field is larger than an integer +(32 bits). However, in this case, the buffer will be incorrectly written -beyond the end because the buffer length is less than the internal minimum +beyond the end because the buffer length is less than the internal +minimum of 64 bits (8 bytes) long. The buffer will be either 5, 6, or 7 bytes long, but a full 8 bytes will be written. @@ -220,7 +300,8 @@ has a much larger code and data size. 2) iASL Compiler/Disassembler and Tools: AcpiExec: Added installation of a handler for the SystemCMOS address -space. This prevents control method abort if a method accesses this space. +space. This prevents control method abort if a method accesses this +space. AcpiExec: Added support for multiple EC devices, and now install EC operation region handler(s) at the actual EC device instead of the @@ -235,7 +316,8 @@ AcpiExec installs a handler for every po Debugger: Enhanced the "handlers" command to display non-root handlers. This change enhances the handlers command to display handlers associated with individual devices throughout the namespace, in addition to the -currently supported display of handlers associated with the root namespace +currently supported display of handlers associated with the root +namespace node. ASL Test Suite: Several test suite errors have been identified and @@ -264,7 +346,8 @@ return from this interface. Handles a po ACPI_WAIT_FOREVER is modified by the host to be a value less than "forever". Jung-uk Kim. -Predefined name support: Add allowed/required argument type information to +Predefined name support: Add allowed/required argument type information +to the master predefined info table. This change adds the infrastructure to enable typechecking on incoming arguments for all predefined methods/objects. It does not actually contain the code that will fully @@ -287,10 +370,12 @@ has a much larger code and data size. 2) iASL Compiler/Disassembler and Tools: -iASL: Implemented a new option to simplify the development of ACPI-related +iASL: Implemented a new option to simplify the development of ACPI- +related BIOS code. Adds support for a new "offset table" output file. The -so option will create a C table containing the AML table offsets of various -named objects in the namespace so that BIOS code can modify them easily at +named objects in the namespace so that BIOS code can modify them easily +at boot time. This can simplify BIOS runtime code by eliminating expensive searches for "magic values", enhancing boot times and adding greater reliability. With assistance from Lee Hamel. @@ -324,11 +409,13 @@ names table (above). Fixed a possible regression on some hosts: Reinstated the safe return macros (return_ACPI_STATUS, etc.) that ensure that the argument is evaluated only once. Although these macros are not needed for the ACPICA -code itself, they are often used by ACPI-related host device drivers where +code itself, they are often used by ACPI-related host device drivers +where the safe feature may be necessary. Fixed several issues related to the ACPI 5.0 reduced hardware support -(SOC): Now ensure that if the platform declares itself as hardware-reduced +(SOC): Now ensure that if the platform declares itself as hardware- +reduced via the FADT, the following functions become NOOPs (and always return AE_OK) because ACPI is always enabled by definition on these machines: AcpiEnable @@ -341,13 +428,15 @@ predefined name return values. Both of t the related device drivers that invoke these methods: 1) For the _STR and _MLS names, automatically repair/convert an ASCII string to a Unicode buffer. -2) For the _CRS, _PRS, and _DMA names, return a resource descriptor with a +2) For the _CRS, _PRS, and _DMA names, return a resource descriptor with +a lone end tag descriptor in the following cases: A Return(0) was executed, a null buffer was returned, or no object at all was returned (non-slack mode only). Adds a new file, nsconvert.c ACPICA BZ 998. Bob Moore, Lv Zheng. -Resource Manager: Added additional code to prevent possible infinite loops +Resource Manager: Added additional code to prevent possible infinite +loops while traversing corrupted or ill-formed resource template buffers. Check for zero-length resource descriptors in all code that loops through resource templates (the length field is used to index through the @@ -388,7 +477,8 @@ iASL: Implemented compile-time validatio predefined names. This new feature validates static package objects returned by the various predefined names defined to return packages. Both object types and package lengths are validated, for both parent packages -and sub-packages, if any. The code is similar in structure and behavior to +and sub-packages, if any. The code is similar in structure and behavior +to the runtime repair mechanism within the AML interpreter and uses the existing predefined name information table. Adds a new file, aslprepkg.c. ACPICA BZ 938. @@ -405,7 +495,8 @@ assumes zero method arguments in these c actual number of arguments without resolution/definition of the method). Debugger: Added support to display all resources with a single command. -Invocation of the resources command with no arguments will now display all +Invocation of the resources command with no arguments will now display +all resources within the current namespace. AcpiHelp: Added descriptive text for each ACPICA exception code displayed @@ -418,8 +509,10 @@ via the -e option. Updated the AcpiGetSleepTypeData interface: Allow the \_Sx methods to return either 1 or 2 integers. Although the ACPI spec defines the \_Sx -objects to return a package containing one integer, most BIOS code returns -two integers and the previous code reflects that. However, we also need to +objects to return a package containing one integer, most BIOS code +returns +two integers and the previous code reflects that. However, we also need +to support BIOS code that actually implements to the ACPI spec, and this change reflects this. @@ -463,12 +556,15 @@ attempt to flush data to the output file This can cause an infinite loop as the max error count code essentially keeps calling itself. -iASL/Disassembler: Added an option (-in) to ignore NOOP opcodes/operators. +iASL/Disassembler: Added an option (-in) to ignore NOOP +opcodes/operators. Implemented for both the compiler and the disassembler. Often, the NOOP -opcode is used as padding for packages that are changed dynamically by the +opcode is used as padding for packages that are changed dynamically by +the BIOS. When disassembled and recompiled, these NOOPs will cause syntax errors. This option causes the disassembler to ignore all NOOP opcodes -(0xA3), and it also causes the compiler to ignore all ASL source code NOOP +(0xA3), and it also causes the compiler to ignore all ASL source code +NOOP statements as well. Debugger: Enhanced the Sleep command to execute all sleep states. This @@ -499,7 +595,8 @@ the existing share bit. Reported by Aaro Interpreter: Fix Store() when an implicit conversion is not possible. For example, in the cases such as a store of a string to an existing package object, implement the store as a CopyObject(). This is a small departure -from the ACPI specification which states that the control method should be +from the ACPI specification which states that the control method should +be aborted in this case. However, the ASLTS suite depends on this behavior. Performance improvement for the various FUNCTION_TRACE and DEBUG_PRINT @@ -538,15 +635,18 @@ iASL: Disallow a method call as argument This change tracks an errata to the ACPI 5.0 document. The AML grammar will not allow the interpreter to differentiate between a method and a method invocation when these are used as an argument to the ObjectType -operator. The ACPI specification change is to disallow a method invocation +operator. The ACPI specification change is to disallow a method +invocation (UserTerm) for the ObjectType operator. Finish support for the TPM2 and CSRT tables in the headers, table compiler, and disassembler. Unix user-space OSL: Fix a problem with WaitSemaphore where the timeout -always expires immediately if the semaphore is not available. The original -code was using a relative-time timeout, but sem_timedwait requires the use +always expires immediately if the semaphore is not available. The +original +code was using a relative-time timeout, but sem_timedwait requires the +use of an absolute time. iASL: Added a remark if the Timer() operator is used within a 32-bit @@ -566,14 +666,18 @@ been updated. Implemented a performance enhancement for ACPI/AML Package objects. This change greatly increases the performance of Package objects within the -interpreter. It changes the processing of reference counts for packages by +interpreter. It changes the processing of reference counts for packages +by optimizing for the most common case where the package sub-objects are -either Integers, Strings, or Buffers. Increases the overall performance of -the ASLTS test suite by 1.5X (Increases the Slack Mode performance by 2X.) +either Integers, Strings, or Buffers. Increases the overall performance +of +the ASLTS test suite by 1.5X (Increases the Slack Mode performance by +2X.) Chao Guan. ACPICA BZ 943. Implemented and deployed common macros to extract flag bits from resource -descriptors. Improves readability and maintainability of the code. Fixes a +descriptors. Improves readability and maintainability of the code. Fixes +a problem with the UART serial bus descriptor for the number of data bits flags (was incorrectly 2 bits, should be 3). @@ -607,14 +711,17 @@ carats (^). ACPICA BZ 984. Debugger: Completed a major update for the Disassemble<method> command. This command was out-of-date and did not properly disassemble control -methods that had any reasonable complexity. This fix brings the command up +methods that had any reasonable complexity. This fix brings the command +up to the same level as the rest of the disassembler. Adds one new file, dmdeferred.c, which is existing code that is now common with the main disassembler and the debugger disassemble command. ACPICA MZ 978. iASL: Moved the parser entry prototype to avoid a duplicate declaration. -Newer versions of Bison emit this prototype, so moved the prototype out of -the iASL header to where it is actually used in order to avoid a duplicate +Newer versions of Bison emit this prototype, so moved the prototype out +of +the iASL header to where it is actually used in order to avoid a +duplicate declaration. iASL/Tools: Standardized use of the stream I/O functions: @@ -622,7 +729,8 @@ iASL/Tools: Standardized use of the stre 2) Ensure proper order of size/count arguments for fread/fwrite 3) Use test of (Actual != Requested) after all fwrite, and most fread 4) Standardize I/O error messages -Improves reliability and maintainability of the code. Bob Moore, Lv Zheng. +Improves reliability and maintainability of the code. Bob Moore, Lv +Zheng. ACPICA BZ 981. Disassembler: Prevent duplicate External() statements. During generation @@ -744,7 +852,8 @@ ACPICA BZ 846. Makefiles: Completely removed the obsolete "Linux" makefiles under -acpica/generate/linux. These makefiles are obsolete and have been replaced +acpica/generate/linux. These makefiles are obsolete and have been +replaced by the generic unix makefiles under acpica/generate/unix. @@ -783,7 +892,8 @@ that is a named object. This change fixe iASL: Fixed a regression where the AML file is not deleted on errors. The AML -output file should be deleted if there are any errors during the compiler. +output file should be deleted if there are any errors during the +compiler. The only exception is if the -f (force output) option is used. ACPICA BZ 974. @@ -838,7 +948,8 @@ ACPICA BZ 969. Implemented support for complex bit-packed buffers returned from the _PLD (Physical Location of Device) predefined method. Adds a new external -interface, AcpiDecodePldBuffer that parses the buffer into a more usable C +interface, AcpiDecodePldBuffer that parses the buffer into a more usable +C structure. Note: C Bitfields cannot be used for this type of predefined structure since the memory layout of individual bitfields is not defined by @@ -853,7 +964,8 @@ during execution of module-level ASL code (code that is executed at table load time.) Lin Ming. -Added the Windows8/Server2012 string for the _OSI method. This change adds +Added the Windows8/Server2012 string for the _OSI method. This change +adds a new _OSI string, "Windows 2012" for both Windows 8 and Windows Server 2012. @@ -870,14 +982,16 @@ GPE support: Removed an extraneous param internal GPE functions. Tang Feng. Removed the linux makefiles from the unix packages. The generate/linux -makefiles are obsolete and have been removed from the unix tarball release +makefiles are obsolete and have been removed from the unix tarball +release packages. The replacement makefiles are under generate/unix, and there is a top-level makefile under the main acpica directory. ACPICA BZ 967, 912. Updates for Unix makefiles: 1) Add -D_FORTIFY_SOURCE=2 for gcc generation. Arjan van de Ven. -2) Update linker flags (move to end of command line) for AcpiExec utility. +2) Update linker flags (move to end of command line) for AcpiExec +utility. Guan Chao. Split ACPICA initialization functions to new file, utxfinit.c. Split from @@ -901,13 +1015,15 @@ much larger code and data size. iASL: Fixed a problem with constant folding for fixed-length constant expressions. The constant-folding code was not being invoked for constant -expressions that allow the use of type 3/4/5 opcodes to generate constants +expressions that allow the use of type 3/4/5 opcodes to generate +constants for expressions such as ByteConstExpr, WordConstExpr, etc. This could result in the generation of invalid AML bytecode. ACPICA BZ 970. iASL: Fixed a generation issue on newer versions of Bison. Newer versions -apparently automatically emit some of the necessary externals. This change +apparently automatically emit some of the necessary externals. This +change handles these versions in order to eliminate generation warnings. Disassembler: Added support to decode the DBG2 and CSRT ACPI tables. @@ -925,7 +1041,8 @@ AE_BAD_PARAMETER was always returned. 1) ACPICA Kernel-resident Subsystem: Fixed a possible fault in the return package object repair code. Fixes a -problem that can occur when a lone package object is wrapped with an outer +problem that can occur when a lone package object is wrapped with an +outer package object in order to force conformance to the ACPI specification. Can affect these predefined names: _ALR, _MLS, _PSS, _TRT, _TSS, _PRT, _HPX, @@ -969,14 +1086,16 @@ table and FADT errors. Additional deployment to be completed as appropriate in the future. The associated conditional macros are ACPI_BIOS_ERROR and -ACPI_BIOS_WARNING. See the ACPICA reference for additional details. ACPICA +ACPI_BIOS_WARNING. See the ACPICA reference for additional details. +ACPICA BZ 843. Implicit notify support: ensure that no memory allocation occurs within a critical region. This fix moves a memory allocation outside of the time that a -spinlock is held. Fixes issues on systems that do not allow this behavior. +spinlock is held. Fixes issues on systems that do not allow this +behavior. Jung-uk Kim. Split exception code utilities and tables into a new file, @@ -1029,7 +1148,8 @@ generates a runtime device notification in the absence of a BIOS-provided GPE control method (_Lxx/_Exx) or a host-installed handler for the GPE. Implicit notify is -provided by ACPICA for Windows compatibility, and is a workaround for BIOS +provided by ACPICA for Windows compatibility, and is a workaround for +BIOS AML code errors. See the description of the AcpiSetupGpeForWake interface in the @@ -1068,9 +1188,11 @@ etc.) AcpiSrc: Fixed several long-standing Linux code translation issues. Argument -descriptions in function headers are now translated properly to lower case +descriptions in function headers are now translated properly to lower +case and -underscores. ACPICA BZ 961. Also fixes translation problems such as these: +underscores. ACPICA BZ 961. Also fixes translation problems such as +these: (old -> new) i_aSL -> iASL 00-7_f -> 00-7F @@ -1112,7 +1234,8 @@ additional information. ACPICA BZ 868. ACPI Tables: Added a new error message for a possible overflow failure during -the conversion of FADT 32-bit legacy register addresses to internal common +the conversion of FADT 32-bit legacy register addresses to internal +common 64- bit GAS structure representation. The GAS has a one-byte "bit length" field, @@ -1149,7 +1272,8 @@ correct External statement. Disassembler: Several additional fixes for the External() statement generation related to some ASL operators. Also, order the External() statements -alphabetically in the disassembler output. Fixes the External() generation +alphabetically in the disassembler output. Fixes the External() +generation for the Create* field, Alias, and Scope operators: 1) Create* buffer field operators - fix type mismatch warning on @@ -1173,7 +1297,8 @@ condition. iASL: Implemented some changes to enhance the IDE support (-vi option.) Error -and Warning messages are now correctly recognized for both the source code +and Warning messages are now correctly recognized for both the source +code browser and the global error and warning counts. ---------------------------------------- @@ -1182,13 +1307,15 @@ browser and the global error and warning 1) ACPICA Core Subsystem: -Implemented support for multiple notify handlers. This change adds support +Implemented support for multiple notify handlers. This change adds +support to allow multiple system and device notify handlers on Device, Thermal Zone, and Processor objects. This can simplify the host OS notification implementation. -Also re-worked and restructured the entire notify support code to simplify +Also re-worked and restructured the entire notify support code to +simplify handler installation, handler removal, notify event queuing, and notify dispatch to handler(s). Note: there can still only be two global notify handlers - one for system notifies and one for device notifies. There are @@ -1229,7 +1356,8 @@ resource tags within resource descriptor StartDependent* descriptor. Reported by Petr Vandrovec. ACPICA BZ 949. -iASL and Preprocessor: Implemented full support for the #line directive to +iASL and Preprocessor: Implemented full support for the #line directive +to correctly track original source file line numbers through the .i preprocessor output file - for error and warning messages. @@ -1250,7 +1378,8 @@ ASL Test Suite (ASLTS): Reduce iASL warn Update for resource descriptor offset fix above. Update/cleanup error output routines. Enable and send iASL errors/warnings to an error logfile -(error.txt). Send all other iASL output to a logfile (compiler.txt). Fixed +(error.txt). Send all other iASL output to a logfile (compiler.txt). +Fixed several extraneous "unrecognized operator" messages. ---------------------------------------- @@ -1260,7 +1389,8 @@ several extraneous "unrecognized operato 1) ACPICA Core Subsystem: Enhanced the sleep/wake interfaces to optionally execute the _GTS method -(Going To Sleep) and the _BFS method (Back From Sleep). Windows apparently +(Going To Sleep) and the _BFS method (Back From Sleep). Windows +apparently does not execute these methods, and therefore these methods are often untested. It has been seen on some systems where the execution of these methods causes errors and also prevents the machine from entering S5. It @@ -1281,8 +1411,10 @@ early. The local FADT table length cannot be set to the common length until the original length has been examined. There is code that checks the table length -and sets various fields appropriately. This can affect older machines with -early FADT versions. For example, this can cause inadvertent writes to the +and sets various fields appropriately. This can affect older machines +with +early FADT versions. For example, this can cause inadvertent writes to +the CST_CNT register. Julian Anastasov. Fixed a mapping issue related to a physical table override. Use the @@ -1295,10 +1427,12 @@ Thomas Renninger, Bob Moore. Enhanced the automatic return-object repair code: Repair a common problem with -predefined methods that are defined to return a variable-length Package of +predefined methods that are defined to return a variable-length Package +of sub-objects. If there is only one sub-object, some BIOS ASL code mistakenly -simply returns the single object instead of a Package with one sub-object. +simply returns the single object instead of a Package with one sub- +object. This new support will repair this error by wrapping a Package object around the original object, creating the correct and expected Package with one @@ -1393,7 +1527,8 @@ method. Some machines require that the G method is executed. Thomas Renninger. -c) In AcpiLeaveSleepState, now always clear the WAK_STS (wake status) bit. +c) In AcpiLeaveSleepState, now always clear the WAK_STS (wake status) +bit. Some BIOS code assumes that WAK_STS will be cleared on resume and use it to determine whether the system is rebooting or resuming. Matthew Garrett. @@ -1429,7 +1564,8 @@ build of ACPICA that supports only the A model. See the ACPICA reference for details. ACPICA BZ 942. This option removes about -10% of the code and 5% of the static data, and the following hardware ACPI +10% of the code and 5% of the static data, and the following hardware +ACPI features become unavailable: PM Event and Control registers SCI interrupt (and handler) @@ -1442,7 +1578,8 @@ features become unavailable: Updated the unix tarball directory structure to match the ACPICA git source tree. This ensures that the generic unix makefiles work properly (in -generate/unix). Also updated the Linux makefiles to match. ACPICA BZ 867. +generate/unix). Also updated the Linux makefiles to match. ACPICA BZ +867. Updated the return value of the _REV predefined method to integer value 5 to @@ -1493,7 +1630,8 @@ the ACPICA reference for additional details. Adds one new file, utilities/utaddress.c. Lin Ming, Bob Moore. -Fixed several issues with the ACPI 5.0 FADT support: Add the sleep Control +Fixed several issues with the ACPI 5.0 FADT support: Add the sleep +Control and Status registers, update the ACPI 5.0 flags, and update internal data structures to handle an FADT larger than 256 bytes. The size of the ACPI @@ -1551,7 +1689,8 @@ summarized below. Reduced Hardware Support: ------------------------- -This support allows for ACPI systems without the usual ACPI hardware. This +This support allows for ACPI systems without the usual ACPI hardware. +This support is enabled by a flag in the revision 5 FADT. If it is set, ACPICA will not attempt to initialize or use any of the usual ACPI hardware. Note, @@ -1571,7 +1710,8 @@ ACPI Tables: ------------ All new tables and updates to existing tables are fully supported in the -ACPICA headers (for use by device drivers), the disassembler, and the iASL +ACPICA headers (for use by device drivers), the disassembler, and the +iASL Data Table Compiler. ACPI 5.0 defines these new tables: BGRT /* Boot Graphics Resource Table */ @@ -1597,7 +1737,8 @@ The new operation region Space IDs are: Resource Descriptors: --------------------- -All new ASL resource descriptors are fully supported by the iASL compiler, +All new ASL resource descriptors are fully supported by the iASL +compiler, the ASL/AML disassembler, and the ACPICA runtime Resource Manager code (including @@ -1615,15 +1756,18 @@ ASL/AML Operators, New and Modified: One new operator is added, the Connection operator, which is used to associate -a GeneralPurposeIo or GenericSerialBus resource descriptor with individual +a GeneralPurposeIo or GenericSerialBus resource descriptor with +individual field objects within an operation region. Several new protocols are associated with the AccessAs operator. All are fully supported by the iASL compiler, disassembler, and runtime ACPICA AML interpreter: - Connection // Declare Field Connection attributes + Connection // Declare Field Connection +attributes AccessAs: AttribBytes (n) // Read/Write N-Bytes Protocol - AccessAs: AttribRawBytes (n) // Raw Read/Write N-Bytes Protocol + AccessAs: AttribRawBytes (n) // Raw Read/Write N-Bytes +Protocol AccessAs: AttribRawProcessBytes (n) // Raw Process Call Protocol RawDataBuffer // Data type for Vendor Data fields @@ -1658,7 +1802,8 @@ drivers and other host OS services: AcpiAcquireMutex and AcpiReleaseMutex: These interfaces allow the host OS to acquire and release AML mutexes that are defined in the DSDT/SSDT tables -provided by the BIOS. They are intended to be used in conjunction with the +provided by the BIOS. They are intended to be used in conjunction with +the ACPI 5.0 _DLM (Device Lock Method) in order to provide transaction-level mutual exclusion with the AML code/interpreter. @@ -1705,7 +1850,8 @@ Non-ACPI 5.0 changes for this release: 1) ACPICA Core Subsystem: -Fix a problem with operation region declarations where a failure can occur +Fix a problem with operation region declarations where a failure can +occur if the region name and an argument that evaluates to an object (such as the region address) are in different namespace scopes. Lin Ming, ACPICA BZ @@ -1757,7 +1903,8 @@ now allowed after every <Term> grammar e iASL: Fixed some possible aliasing warnings during generation. ACPICA BZ 923. -Disassembler: Fix problem with disassembly of the DataTableRegion operator +Disassembler: Fix problem with disassembly of the DataTableRegion +operator where an inadvertent "Unhandled deferred opcode" message could be generated. @@ -1785,15 +1932,18 @@ Support for ACPI 5.0 in ACPICA has been will be released at the same time that ACPI 5.0 is officially released. -The ACPI 5.0 specification is on track for release in the next few months. +The ACPI 5.0 specification is on track for release in the next few +months. 1) ACPICA Core Subsystem: Fixed a problem where the maximum sleep time for the Sleep() operator was -intended to be limited to two seconds, but was inadvertently limited to 20 +intended to be limited to two seconds, but was inadvertently limited to +20 seconds instead. -Linux and Unix makefiles: Added header file dependencies to ensure correct +Linux and Unix makefiles: Added header file dependencies to ensure +correct generation of ACPICA core code and utilities. Also simplified the makefiles considerably through the use of the vpath variable to specify search @@ -1806,8 +1956,10 @@ iASL: Implemented support to check the a created to access named Resource Descriptor fields. For example, if a resource field is -defined to be two bits, a warning is issued if a CreateXxxxField() is used -with an incorrect bit length. This is implemented for all current resource +defined to be two bits, a warning is issued if a CreateXxxxField() is +used +with an incorrect bit length. This is implemented for all current +resource descriptor names. ACPICA BZ 930. Disassembler: Fixed a byte ordering problem with the output of 24-bit and @@ -1829,13 +1981,15 @@ AML output). Includes listings, hex file iASL: Added -G option to the table compiler to allow the compilation of custom -ACPI tables. The only part of a table that is required is the standard 36- +ACPI tables. The only part of a table that is required is the standard +36- byte ACPI header. AcpiXtract: Ported to the standard ACPICA environment (with ACPICA headers), -which also adds correct 64-bit support. Also, now all output filenames are +which also adds correct 64-bit support. Also, now all output filenames +are completely lower case. AcpiExec: Ignore any non-AML tables (tables other than DSDT or SSDT) when @@ -1844,7 +1998,8 @@ exception is an FADT. This also fixes a load non-AML tables. ACPICA BZ 932. -AcpiHelp: Added the AccessAs and Offset operators. Fixed a problem where a +AcpiHelp: Added the AccessAs and Offset operators. Fixed a problem where +a missing table terminator could cause a fault when using the -p option. AcpiSrc: Fixed a possible divide-by-zero fault when generating file @@ -1875,7 +2030,8 @@ Updated the predefined name repair mecha _TSS return object if a _PSS object is present. We can only sort the _TSS return -package if there is no _PSS within the same scope. This is because if _PSS +package if there is no _PSS within the same scope. This is because if +_PSS is present, the ACPI specification dictates that the _TSS Power Dissipation field @@ -1887,9 +2043,11 @@ is. Reported by, and fixed with assistan Added an option to globally disable the control method return value validation -and repair. This runtime option can be used to disable return value repair +and repair. This runtime option can be used to disable return value +repair if -this is causing a problem on a particular machine. Also added an option to +this is causing a problem on a particular machine. Also added an option +to AcpiExec (-dr) to set this disable flag. All makefiles and project files: Major changes to improve generation of @@ -1935,11 +2093,13 @@ provides the following functionality: of arguments, and the return value data type. Find/display AML opcode name(s) -- with opcode, arguments, and grammar. - Decode/display AML opcode -- with opcode name, arguments, and grammar. + Decode/display AML opcode -- with opcode name, arguments, and +grammar. Service Layers: Make multi-thread support configurable. Conditionally compile -the multi-thread support so that threading libraries will not be linked if +the multi-thread support so that threading libraries will not be linked +if not necessary. The only tool that requires multi-thread support is AcpiExec. @@ -1972,7 +2132,8 @@ signature. Now, only allow SSDT, OEMx, a interpreter errors and kernel faults. So now, we once again allow only SSDT, OEMx, and now, also a null signature. (05/2011). -Added the missing _TDL predefined name to the global name list in order to +Added the missing _TDL predefined name to the global name list in order +to enable validation. Affects both the core ACPICA code and the iASL compiler. @@ -2039,11 +2200,14 @@ device even if there is no corresponding EmbeddedControl. Fixes a problem seen on some machines and apparently is compatible with Windows behavior. ACPICA BZ 875. -Added more predefined methods that are eligible for automatic NULL package -element removal. This change adds another group of predefined names to the +Added more predefined methods that are eligible for automatic NULL +package +element removal. This change adds another group of predefined names to +the list of names that can be repaired by having NULL package elements dynamically -removed. This group are those methods that return a single variable-length +removed. This group are those methods that return a single variable- +length package containing simple data types such as integers, buffers, strings. This includes: _ALx, _BCL, _CID,_ DOD, _EDL, _FIX, _PCL, _PLD, _PMD, _PRx, @@ -2082,7 +2246,8 @@ data size. iASL/DTC: Major update for new grammar features. Allow generic data types in -custom ACPI tables. Field names are now optional. Any line can be split to +custom ACPI tables. Field names are now optional. Any line can be split +to multiple lines using the continuation char (\). Large buffers now use line- continuation character(s) and no colon on the continuation lines. See the @@ -2108,7 +2273,8 @@ region declaration in the same scope. If useful since it probably won't be executed. ACPICA BZ 915. -iASL/DTC: Finish support for expression evaluation. Added a new expression +iASL/DTC: Finish support for expression evaluation. Added a new +expression parser that implements c-style operator precedence and parenthesization. ACPICA bugzilla @@ -2129,10 +2295,12 @@ AcpiXtract: Fix for RSDP and dynamic SSD "unusual" headers in the acpidump file. Update the header validation to support these -tables. Problem introduced in previous AcpiXtract version in the change to +tables. Problem introduced in previous AcpiXtract version in the change +to support "wrong checksum" error messages emitted by acpidump utility. -iASL: Add a * option to generate all template files (as a synonym for ALL) +iASL: Add a * option to generate all template files (as a synonym for +ALL) as in "iasl -T *" or "iasl -T ALL". @@ -2158,7 +2326,8 @@ root object was passed to the AcpiSetupG Implemented support for "spurious" Global Lock interrupts. On some systems, a -global lock interrupt can occur without the pending flag being set. Upon a +global lock interrupt can occur without the pending flag being set. Upon +a GL interrupt, we now ensure that a thread is actually waiting for the lock before @@ -2188,7 +2357,8 @@ header files, disassembler, table compil Moore, Lin Ming. -AcpiXtract: Correctly handle embedded comments and messages from AcpiDump. +AcpiXtract: Correctly handle embedded comments and messages from +AcpiDump. Apparently some or all versions of acpidump will occasionally emit a comment like @@ -2209,8 +2379,10 @@ for a user-defined address space. This i 1) ACPI CA Core Subsystem: -Added a mechanism to defer _REG methods for some early-installed handlers. -Most user handlers should be installed before call to AcpiEnableSubsystem. +Added a mechanism to defer _REG methods for some early-installed +handlers. +Most user handlers should be installed before call to +AcpiEnableSubsystem. However, Event handlers and region handlers should be installed after AcpiInitializeObjects. Override handlers for the "default" regions should be @@ -2222,15 +2394,18 @@ Implemented an optimization for GPE dete simply ignore GPE registers that contain no enabled GPEs -- there is no need to read the register since this information is available internally. This -becomes more important on machines with a large GPE space. ACPICA bugzilla +becomes more important on machines with a large GPE space. ACPICA +bugzilla 884. Lin Ming. Suggestion from Joe Liu. -Removed all use of the highly unreliable FADT revision field. The revision +Removed all use of the highly unreliable FADT revision field. The +revision number in the FADT has been found to be completely unreliable and cannot be trusted. Only the actual table length can be used to infer the version. This -change updates the ACPICA core and the disassembler so that both no longer +change updates the ACPICA core and the disassembler so that both no +longer even look at the FADT version and instead depend solely upon the FADT length. @@ -2278,7 +2453,8 @@ global handlers. installation status -- default or user-installed handler will be used. -iASL: Warn if reserved method incorrectly returns a value. Many predefined +iASL: Warn if reserved method incorrectly returns a value. Many +predefined names are defined such that they do not return a value. If implemented as a method, issue a warning if such a name explicitly returns a value. ACPICA @@ -2311,7 +2487,8 @@ a single screen, instead of help subcomm Fixed a race condition between method execution and namespace walks that can possibly cause a fault. The problem was apparently introduced in version -20100528 as a result of a performance optimization that reduces the number +20100528 as a result of a performance optimization that reduces the +number of namespace walks upon method exit by using the delete_namespace_subtree function instead of the delete_namespace_by_owner function used @@ -2323,7 +2500,8 @@ Fixed several issues and a possible faul method support. History: This support changes a method to "serialized" on the fly if the method generates an AE_ALREADY_EXISTS error, indicating the -possibility that it cannot handle reentrancy. This fix repairs a couple of +possibility that it cannot handle reentrancy. This fix repairs a couple +of issues seen in the field, especially on machines with many cores: 1) Delete method children only upon the exit of the last thread, @@ -2380,7 +2558,8 @@ much larger code and data size. iASL: Added generic data types to the Data Table compiler. Add "generic" data -types such as UINT32, String, Unicode, etc., to simplify the generation of +types such as UINT32, String, Unicode, etc., to simplify the generation +of platform-defined tables such as UEFI. Lin Ming. iASL: Added listing support for the Data Table Compiler. Adds listing @@ -2407,15 +2586,18 @@ a handful of new interfaces: One new file, evxfgpe.c to consolidate all external GPE interfaces. See the ACPICA Programmer Reference for full details and programming -information. See the new section 4.4 "General Purpose Event (GPE) Support" +information. See the new section 4.4 "General Purpose Event (GPE) +Support" for a full overview, and section 8.7 "ACPI General Purpose Event Management" -for programming details. ACPICA BZ 858,870,877. Matthew Garrett, Lin Ming, +for programming details. ACPICA BZ 858,870,877. Matthew Garrett, Lin +Ming, Bob Moore, Rafael Wysocki. Implemented a new GPE feature for Windows compatibility, the "Implicit Wake -GPE Notify". This feature will automatically issue a Notify(2) on a device +GPE Notify". This feature will automatically issue a Notify(2) on a +device when a Wake GPE is received if there is no corresponding GPE method or handler. ACPICA BZ 870. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-vendor@FreeBSD.ORG Fri Jul 26 18:20:53 2013 Return-Path: <owner-svn-src-vendor@FreeBSD.ORG> Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C4C00EC; Fri, 26 Jul 2013 18:20:53 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 987202A10; Fri, 26 Jul 2013 18:20:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6QIKr6Q048084; Fri, 26 Jul 2013 18:20:53 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6QIKrXd048083; Fri, 26 Jul 2013 18:20:53 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201307261820.r6QIKrXd048083@svn.freebsd.org> From: Jung-uk Kim <jkim@FreeBSD.org> Date: Fri, 26 Jul 2013 18:20:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r253682 - vendor-sys/acpica/20130725 X-SVN-Group: vendor-sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree <svn-src-vendor.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>, <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor> List-Post: <mailto:svn-src-vendor@freebsd.org> List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>, <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 26 Jul 2013 18:20:53 -0000 Author: jkim Date: Fri Jul 26 18:20:52 2013 New Revision: 253682 URL: http://svnweb.freebsd.org/changeset/base/253682 Log: Tag ACPICA 20130725. Added: vendor-sys/acpica/20130725/ - copied from r253681, vendor-sys/acpica/dist/ From owner-svn-src-vendor@FreeBSD.ORG Sat Jul 27 18:42:47 2013 Return-Path: <owner-svn-src-vendor@FreeBSD.ORG> Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 03DA98E7; Sat, 27 Jul 2013 18:42:47 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E0BFC2048; Sat, 27 Jul 2013 18:42:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6RIgkEH086220; Sat, 27 Jul 2013 18:42:46 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6RIgkCO086217; Sat, 27 Jul 2013 18:42:46 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201307271842.r6RIgkCO086217@svn.freebsd.org> From: "Pedro F. Giffuni" <pfg@FreeBSD.org> Date: Sat, 27 Jul 2013 18:42:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r253716 - in vendor/patch: 2.4 2.4/contrib 2.5 2.5/contrib dist dist/contrib X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree <svn-src-vendor.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>, <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor> List-Post: <mailto:svn-src-vendor@freebsd.org> List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>, <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 27 Jul 2013 18:42:47 -0000 Author: pfg Date: Sat Jul 27 18:42:46 2013 New Revision: 253716 URL: http://svnweb.freebsd.org/changeset/base/253716 Log: Flatten gnu-patch vendor tree. - Revert r128777: We have a new permissively licensed version of patch(1) and the older partially GPL'd version is about to be abandoned so having this back shouldn't be the cause of any confusion. - Flatten the tags too. - Disable keyword expansion as suggested in the committers guide. This doesn't mean that any of this will be imported. Added: vendor/patch/2.4/COPYING - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/COPYING vendor/patch/2.4/ChangeLog - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/ChangeLog vendor/patch/2.4/NEWS - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/NEWS vendor/patch/2.4/README - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/README vendor/patch/2.4/acconfig.h - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/acconfig.h vendor/patch/2.4/addext.c - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/addext.c vendor/patch/2.4/argmatch.c - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/argmatch.c vendor/patch/2.4/argmatch.h - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/argmatch.h vendor/patch/2.4/backupfile.c - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/backupfile.c vendor/patch/2.4/backupfile.h - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/backupfile.h vendor/patch/2.4/basename.c - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/basename.c vendor/patch/2.4/common.h - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/common.h vendor/patch/2.4/getopt.c - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/getopt.c vendor/patch/2.4/getopt.h - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/getopt.h vendor/patch/2.4/getopt1.c - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/getopt1.c vendor/patch/2.4/inp.c - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/inp.c vendor/patch/2.4/inp.h - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/inp.h vendor/patch/2.4/maketime.c - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/maketime.c vendor/patch/2.4/maketime.h - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/maketime.h vendor/patch/2.4/memchr.c - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/memchr.c vendor/patch/2.4/partime.c - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/partime.c vendor/patch/2.4/partime.h - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/partime.h vendor/patch/2.4/patch.1 - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/patch.1 vendor/patch/2.4/patch.c - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/patch.c vendor/patch/2.4/pch.c - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/pch.c vendor/patch/2.4/pch.h - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/pch.h vendor/patch/2.4/quotearg.c - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/quotearg.c vendor/patch/2.4/quotearg.h - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/quotearg.h vendor/patch/2.4/rename.c - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/rename.c vendor/patch/2.4/util.c - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/util.c vendor/patch/2.4/util.h - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/util.h vendor/patch/2.4/version.c - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/version.c vendor/patch/2.4/version.h - copied unchanged from r253715, vendor/patch/2.4/contrib/patch/version.h vendor/patch/2.5/COPYING - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/COPYING vendor/patch/2.5/ChangeLog - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/ChangeLog vendor/patch/2.5/INSTALL - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/INSTALL vendor/patch/2.5/Makefile.in - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/Makefile.in vendor/patch/2.5/NEWS - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/NEWS vendor/patch/2.5/README - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/README vendor/patch/2.5/acconfig.h - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/acconfig.h vendor/patch/2.5/addext.c - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/addext.c vendor/patch/2.5/argmatch.c - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/argmatch.c vendor/patch/2.5/argmatch.h - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/argmatch.h vendor/patch/2.5/backupfile.c - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/backupfile.c vendor/patch/2.5/backupfile.h - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/backupfile.h vendor/patch/2.5/basename.c - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/basename.c vendor/patch/2.5/common.h - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/common.h vendor/patch/2.5/config.hin - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/config.hin vendor/patch/2.5/configure - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/configure vendor/patch/2.5/configure.in - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/configure.in vendor/patch/2.5/getopt.c - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/getopt.c vendor/patch/2.5/getopt.h - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/getopt.h vendor/patch/2.5/getopt1.c - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/getopt1.c vendor/patch/2.5/inp.c - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/inp.c vendor/patch/2.5/inp.h - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/inp.h vendor/patch/2.5/install-sh - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/install-sh vendor/patch/2.5/maketime.c - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/maketime.c vendor/patch/2.5/maketime.h - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/maketime.h vendor/patch/2.5/memchr.c - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/memchr.c vendor/patch/2.5/partime.c - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/partime.c vendor/patch/2.5/partime.h - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/partime.h vendor/patch/2.5/patch.1 - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/patch.1 vendor/patch/2.5/patch.c - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/patch.c vendor/patch/2.5/pch.c - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/pch.c vendor/patch/2.5/pch.h - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/pch.h vendor/patch/2.5/quotearg.c - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/quotearg.c vendor/patch/2.5/quotearg.h - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/quotearg.h vendor/patch/2.5/rename.c - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/rename.c vendor/patch/2.5/util.c - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/util.c vendor/patch/2.5/util.h - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/util.h vendor/patch/2.5/version.c - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/version.c vendor/patch/2.5/version.h - copied unchanged from r253715, vendor/patch/2.5/contrib/patch/version.h vendor/patch/dist/ - copied from r128776, vendor/patch/dist/ - copied unchanged from r128776, vendor/patch/dist/contrib/patch/COPYING - copied unchanged from r128776, vendor/patch/dist/contrib/patch/ChangeLog - copied unchanged from r128776, vendor/patch/dist/contrib/patch/INSTALL - copied unchanged from r128776, vendor/patch/dist/contrib/patch/Makefile.in - copied unchanged from r128776, vendor/patch/dist/contrib/patch/NEWS - copied unchanged from r128776, vendor/patch/dist/contrib/patch/README - copied unchanged from r128776, vendor/patch/dist/contrib/patch/acconfig.h - copied unchanged from r128776, vendor/patch/dist/contrib/patch/addext.c - copied unchanged from r128776, vendor/patch/dist/contrib/patch/argmatch.c - copied unchanged from r128776, vendor/patch/dist/contrib/patch/argmatch.h - copied unchanged from r128776, vendor/patch/dist/contrib/patch/backupfile.c - copied unchanged from r128776, vendor/patch/dist/contrib/patch/backupfile.h - copied unchanged from r128776, vendor/patch/dist/contrib/patch/basename.c - copied unchanged from r128776, vendor/patch/dist/contrib/patch/common.h - copied unchanged from r128776, vendor/patch/dist/contrib/patch/config.hin - copied unchanged from r128776, vendor/patch/dist/contrib/patch/configure - copied unchanged from r128776, vendor/patch/dist/contrib/patch/configure.in - copied unchanged from r128776, vendor/patch/dist/contrib/patch/getopt.c - copied unchanged from r128776, vendor/patch/dist/contrib/patch/getopt.h - copied unchanged from r128776, vendor/patch/dist/contrib/patch/getopt1.c - copied unchanged from r128776, vendor/patch/dist/contrib/patch/inp.c - copied unchanged from r128776, vendor/patch/dist/contrib/patch/inp.h - copied unchanged from r128776, vendor/patch/dist/contrib/patch/install-sh - copied unchanged from r128776, vendor/patch/dist/contrib/patch/maketime.c - copied unchanged from r128776, vendor/patch/dist/contrib/patch/maketime.h - copied unchanged from r128776, vendor/patch/dist/contrib/patch/memchr.c - copied unchanged from r128776, vendor/patch/dist/contrib/patch/partime.c - copied unchanged from r128776, vendor/patch/dist/contrib/patch/partime.h - copied unchanged from r128776, vendor/patch/dist/contrib/patch/patch.1 - copied unchanged from r128776, vendor/patch/dist/contrib/patch/patch.c - copied unchanged from r128776, vendor/patch/dist/contrib/patch/pch.c - copied unchanged from r128776, vendor/patch/dist/contrib/patch/pch.h - copied unchanged from r128776, vendor/patch/dist/contrib/patch/quotearg.c - copied unchanged from r128776, vendor/patch/dist/contrib/patch/quotearg.h - copied unchanged from r128776, vendor/patch/dist/contrib/patch/rename.c - copied unchanged from r128776, vendor/patch/dist/contrib/patch/util.c - copied unchanged from r128776, vendor/patch/dist/contrib/patch/util.h - copied unchanged from r128776, vendor/patch/dist/contrib/patch/version.c - copied unchanged from r128776, vendor/patch/dist/contrib/patch/version.h Directory Properties: vendor/patch/dist/COPYING (props changed) vendor/patch/dist/ChangeLog (props changed) vendor/patch/dist/INSTALL (props changed) vendor/patch/dist/Makefile.in (props changed) vendor/patch/dist/NEWS (props changed) vendor/patch/dist/README (props changed) vendor/patch/dist/acconfig.h (props changed) vendor/patch/dist/addext.c (props changed) vendor/patch/dist/argmatch.c (props changed) vendor/patch/dist/argmatch.h (props changed) vendor/patch/dist/backupfile.c (props changed) vendor/patch/dist/backupfile.h (props changed) vendor/patch/dist/basename.c (props changed) vendor/patch/dist/common.h (props changed) vendor/patch/dist/config.hin (props changed) vendor/patch/dist/configure (props changed) vendor/patch/dist/configure.in (props changed) vendor/patch/dist/getopt.c (props changed) vendor/patch/dist/getopt.h (props changed) vendor/patch/dist/getopt1.c (props changed) vendor/patch/dist/inp.c (props changed) vendor/patch/dist/inp.h (props changed) vendor/patch/dist/install-sh (props changed) vendor/patch/dist/maketime.c (props changed) vendor/patch/dist/maketime.h (props changed) vendor/patch/dist/memchr.c (props changed) vendor/patch/dist/partime.c (props changed) vendor/patch/dist/partime.h (props changed) vendor/patch/dist/patch.1 (props changed) vendor/patch/dist/patch.c (props changed) vendor/patch/dist/pch.c (props changed) vendor/patch/dist/pch.h (props changed) vendor/patch/dist/quotearg.c (props changed) vendor/patch/dist/quotearg.h (props changed) vendor/patch/dist/rename.c (props changed) vendor/patch/dist/util.c (props changed) vendor/patch/dist/util.h (props changed) vendor/patch/dist/version.c (props changed) vendor/patch/dist/version.h (props changed) Deleted: vendor/patch/2.4/contrib/ vendor/patch/2.5/contrib/ vendor/patch/dist/contrib/ Modified: Directory Properties: vendor/patch/ (props changed) Copied: vendor/patch/2.4/COPYING (from r253715, vendor/patch/2.4/contrib/patch/COPYING) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/patch/2.4/COPYING Sat Jul 27 18:42:46 2013 (r253716, copy of r253715, vendor/patch/2.4/contrib/patch/COPYING) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) 19yy <name of author> + + 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Copied: vendor/patch/2.4/ChangeLog (from r253715, vendor/patch/2.4/contrib/patch/ChangeLog) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/patch/2.4/ChangeLog Sat Jul 27 18:42:46 2013 (r253716, copy of r253715, vendor/patch/2.4/contrib/patch/ChangeLog) @@ -0,0 +1,1627 @@ +1997-06-19 Paul Eggert <eggert@pogo.gnu.ai.mit.edu> + + * configure.in (VERSION): Version 2.4 released. + * NEWS: Patch is now verbose when patches do not match exactly. + +1997-06-17 Paul Eggert <eggert@twinsun.com> + + * pc/djgpp/configure.sed (config.h): Remove redundant $(srcdir). + + * configure.in (VERSION): Bump to 2.3.9. + * patch.c (main): By default, warn about hunks that succeed + with nonzero offset. + * patch.man: Add LC_ALL=C advice for making patches. + * pc/djgpp/configure.sed (config.h): Fix paths to dependent files. + +1997-06-17 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Bump to 2.3.8. + + * pch.c (open_patch_file): Test stdin for fseekability. + (intuit_diff_type): Missing context diff headers are now warnings, + not errors; some people use patches with them (e.g. when retrying + rejects). + + * patch.c (struct outstate): + New type, collecting together some output state vars. + (apply_hunk, copy_till, spew_output, init_output): Use it. + Keep track of whether some output has been generated. + (backup_if_mismatch): New var. + (ofp): Remove, in favor of local struct outstate vars. + (main): Use struct outstate. Initialize backup_if_mismatch to + be the inverse of posixly_correct. Keep track of whether mismatches + occur, and use this to implement backup_if_mismatch. + Report files that are not empty after patching, but should be. + (longopts, option_help, get_some_switches): New options + --backup-if-mismatch, --no-backup-if-mismatch. + (get_some_switches): -B, -Y, -z no longer set backup_type. + * backupfile.c (find_backup_file_name): + Treat backup_type == none like simple. + + * Makefile.in (CONFIG_HDRS): + Remove var; no longer needed by djgpp port. + (DISTFILES_PC_DJGPP): Rename pc/djgpp/config.sed to + pc/djgpp/configure.sed; remove pc/djgpp/config.h in favor of + new file that edits it, called pc/djgpp/config.sed. + * pc/djgpp/configure.bat: Rename config.sed to configure.sed. + * pc/djgpp/configure.sed (CONFIG_HDRS): Remove. + (config.h): Add rule to build this from config.hin and + pc/djgpp/config.sed. + * pc/djgpp/config.sed: + Convert from .h file to .sed script that generates .h file. + + * NEWS: Describe --backup-if-mismatch, --no-backup-if-mismatch. + * patch.man: + Describe new options --backup-if-mismatch, --no-backup-if-mismatch + and their ramifications. Use unreadable backup to represent + nonexistent file. + +1997-06-12 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Bump to 2.3.7. + (AC_CHECK_FUNCS): Add `raise'. + + * Makefile.in (inp.o): No longer depends on quotearg.h. + + * common.h (outfile): New decl (was private var named `output'). + (invc): New decl. + (GENERIC_OBJECT): Renamed from VOID. + (NULL_DEVICE, TTY_DEVICE): New macros. + + * patch.c (output): Remove; renamed to `outfile' and moved to common.h. + (main): `failed' is count, not boolean. + Say "Skipping patch." when deciding to skip patch. + (get_some_switches): Set invc when setting inname. + + * inp.c: Do not include <quotearg.h>. + (SCCSPREFIX, GET, GET_LOCKED, SCCSDIFF1, SCCSDIFF2, SCCSDIFF3, + RCSSUFFIX, CHECKOUT, CHECKOUT_LOCKED, RCSDIFF1, RCSDIFF2): + Move to util.c. + (get_input_file): Invoke new functions version_controller and + version_get to simplify this code. + (plan_b): "/dev/tty" -> NULL_DEVICE + + * pch.h (pch_timestamp): New decl. + * pch.c (p_timestamp): New var; takes over from global timestamp array. + (pch_timestamp): New function to export p_timestamp. + (there_is_another_patch): Use blander wording when you can't intuit + the file name. + Say "Skipping patch." when deciding to skip patch. + (intuit_diff_type): Look for version-controlled but nonexistent files + when intuiting file names; set invc accordingly. + Ignore Index: line if either old or new line is present, and if + POSIXLY_CORRECT is not set. + (do_ed_script): Flush stdout before invoking popen, since it may + send output to stdout. + + * util.h (version_controller, version_get): New decls. + * util.c: Include <quotearg.h> earlier. + (raise): New macro, if ! HAVE_RAISE. + (move_file): Create empty unreadable file when backing up a nonexistent + file. + (DEV_NULL): New constant. + (SCCSPREFIX, GET. GET_LOCKED, SCCSDIFF1, SCCSDIFF2, + RCSSUFFIX, CHECKOUT, CHECKOUT_LOCKED, RCSDIFF1): Moved here from inp.c. + (version_controller, version_get): New functions. + (ask): Look only at /dev/tty for answers; and when standard output is + not a terminal and ! posixly_correct, don't even look there. + Remove unnecessary fflushes of stdout. + (ok_to_reverse): Say "Skipping patch." when deciding to skip patch.. + (sigs): SIGPIPE might not be defined. + (exit_with_signal): Use `raise' instead of `kill'. + (systemic): fflush stdout before invoking subsidiary command. + + * patch.man: Document recent changes. + Add "COMPATIBILITY ISSUES" section. + + * NEWS: New COMPATIBILITY ISSUES for man page. + Changed verbosity when fuzz is found. + File name intuition is changed, again. + Backups are made unreadable when the file did not exist. + + * pc/djgpp/config.h (HAVE_STRUCT_UTIMBUF): Define. + (HAVE_RAISE): New macro. + (HAVE_UTIME_H): Define. + (TZ_is_unset): Do not define; it's not a serious problem with `patch' + to have TZ be unset in DOS. + +1997-06-08 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Bump to 2.3.6. + (AC_CHECK_HEADERS): Add utime.h. + * acconfig.h, configure.in, pc/djgpp/config.h (HAVE_STRUCT_UTIMBUF): + New macro. + * pc/djgpp/config.h (HAVE_UTIME_H, TZ_is_unset): New macros. + + * NEWS, patch.man: Describe new -Z, -T options, new numeric + option for -G, retired -G, and more verbose default behavior + with fuzz. + + * pch.c (intuit_diff_type): Record times reported for files in headers. + Remove head_says_nonexistent[x], since it's now equivalent to + !timestamp[x]. + * util.h (fetchname): Change argument head_says_nonexistent to + timestamp. + * util.c: #include <partime.h> for TM_LOCAL_ZONE. + Don't include <time.h> since common.h now includes it. + (ok_to_reverse): noreverse and batch cases now output regardless of + verbosity. + (fetchname): Change argument head_says_nonexistent to pstamp, and + store header timestamp into *pstamp. + If -T or -Z option is given, match time stamps more precisely. + (ask): Remove unnecessary close of ttyfd. + When there is no terminal at all, output a newline to make the + output look nicer. After reporting EOF, flush stdout; + when an input error, report the error type. + + * inp.c (get_input_file): + Ask user whether to get file if patch_get is negative. + + * Makefile.in (clean): Don't clean */*.o; clean core* and *core. + +1997-06-04 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Bump to 2.3.5. + + * util.c (ok_to_reverse): + Be less chatty if verbosity is SILENT and we don't + have to ask the user. If force is nonzero, apply the patch anyway. + + * pch.c (there_is_another_patch): + Before skipping rest of patch, skip to + the patch start, so that another_hunk can skip it properly. + (intuit_diff_type): Slight wording change for missing headers, to + regularize with other diagnostics. Fix off-by-one error when setting + p_input_line when scanning the first hunk to check for deleted files. + +1997-06-03 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Bump to 2.3.4. + + * NEWS: Now matches more generously against nonexistent or empty files. + + * pch.c (there_is_another_patch): Move warning about not being + able to intuit file names here from skip_to. + (intuit_diff_type): Fatal error if we find a headless unified + or context diff. + + * util.c (ask): Null-terminate buffer properly even if it grew. + (fetchname): No need to test for null first argument. + +1997-06-02 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Bump to 2.3.3. + * pch.c (p_says_nonexistent, pch_says_nonexistent): Is now 1 for empty, + 2 for nonexistent. + (intuit_diff_type): Set p_says_nonexistent according to new meaning. + Treat empty files like nonexistent files when reversing. + (skip_to): Output better diagnostic when we can't intuit a file name. + * patch.c (main): + Count bytes, not lines, when testing whether a file is empty, + since it may contain only non-newline chars. + pch_says_nonexistent now returns 2 for nonexistent files. + +1997-06-01 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Bump to 2.3.2. + * pch.c (open_patch_file): + Fix bug when computing size of patch read from a pipe. + +1997-05-30 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Bump to 2.3.1. + + * Makefile.in (transform, patch_name): New vars, + for proper implementation of AC_ARG_PROGRAM. + (install, uninstall): Use them. + (install-strip): New rule. + * pc/djgpp/config.sed (program_transform_name): Set to empty. + +1997-05-30 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION), NEWS: Version 2.3 released. + * patch.man: Fix two font typos. + * util.c (doprogram): Fix misspelled decl. + +1997-05-26 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Bump to 2.2.93. + + * pch.c (open_patch_file): + Fatal error if binary_transput and stdin is a tty. + + * pc/djgpp/config.sed (chdirsaf.c): + Use sed instead of cp, since cp might not be installed. + * pc/djgpp/configure.bat: + Prepend %srcdir% to pathname of config.sed, for crosscompiles. + +1997-05-25 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Bump to 2.2.92. + (D_INO_IN_DIRENT): New macro. + * pc/djgpp/config.h, acconfig.h (D_INO_IN_DIRENT): New macro. + * backupfile.c (REAL_DIR_ENTRY): + Depend on D_INO_IN_DIRENT, not _POSIX_VERSION. + + * addext.c (addext): Adjust slen when adjusting s for DOS 8.3 limit. + Do not use xxx.h -> xxxh~ hack. + + * util.c: (move_file): Avoid makedirs test when possible even + if FILESYSTEM_PREFIX_LEN (p) is nonzero. Don't play + case-changing tricks to come up with backup file name; it's + not portable to case-insensitive file systems. + * common.h (ISLOWER): Remove. + + * inp.c (scan_input): Don't use Plan A if (debug & 16). + + * patch.c (shortopts): Add -g, -G. + (longopts): --help now maps to 132, not 'h', to avoid confusion. + (get_some_switches): Likewise. + Don't invoke setmode on input if --binary; wait until needed. + Don't ever invoke setmode on stdout. + * pch.c (open_patch_file): Setmode stdin to binary if binary_transput. + + * patch.man: Fix documentation of backup file name to match behavior. + Add advice for ordering of patches of derived files. + Add /dev/tty to list of files used. + * README: Adjust instructions for building on DOS. + * pc/djgpp/README: Remove tentative wording. + * NEWS: The DOS port is now tested. + Backup file names are no longer computed by switching case. + + * pc/chdirsaf.c (ERANGE): Include <errno.h> to define it. + (restore_wd): chdir unconditionally. + (chdir_safer): Invoke atexit successfully at most once. + * pc/djgpp/config.sed: Use chdirsaf.o, not pc/chdirsaf.o. + Replace CONFIG_HDRS, don't append. + Use $(srcdir) in CONFIG_STATUS. + Don't apply $(SHELL) to $(CONFIG_STATUS). + Append rules for chdirsaf.o, chdirsaf.c; clean chdirsaf.c at the end. + * pc/djgpp/configure.bat: Append CR to each line; DOS needs this. + Don't use | as sed s delimiter; DOS can't handle it. + +1997-05-21 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Bump to 2.2.91. + + * pch.c (another_hunk): + Fix bug with computing size of prefix and suffix context + with ordinary context diffs. Report malformed patch if a unified diff + has nothing but context. + + * inp.c (get_input_file): + Use patch_get, not backup_type, to decide whether to + get from RCS or SCCS. Use the word `get' in diagnostics. + * patch.c (main): Initialize patch_get from PATCH_GET. + Omit DEFAULT_VERSION_CONTROL hook; it just leads to nonstandarization. + (longopts, option_help, get_some_switches): Add support for -g, -G. + (option_help): Add bug report address. + * common.h (patch_get): New decl. + * patch.man: Add -g and -G options; use `get' instead of `check out'. + Add PATCH_GET. Recommend -Naur instead of -raNU2 for diff. + * NEWS: Describe -g, -G, PATCH_GET. + + * version.c (copyright_string): Use only most recent copyright year, + as per GNU standards. + + * Makefile.in (DISTFILES_PC): Remove pc/quotearg.c. + * pc/djgpp/config.sed: Remove unnecessary hooks for quotearg and SHELL. + +1997-05-18 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Increase to 2.2.9. + (AC_TYPE_MODE_T): Add. + + * pch.h (another_hunk): New parameter REV. + * pch.c (hunkmax): Now of type LINENUM. + (malformed): Add decl. + (there_is_another_patch): Skip inname-detection if skip_rest_of_patch. + (intuit_diff_type): To determine whether file appears to have been + deleted, look at replacement, not pattern. + If there is a mismatch between existence of file and whether the + patch claims to change whether the file exists, ask whether to + reverse the patch. + (another_hunk): New parameter REV specifying whether to reverse the + hunk. All callers changed. + (do_ed_script): Add assertion to ensure input file exists. + + * util.h (create_file): New function. + (copy_file): Now takes mode, not struct stat. + (makedirs): No longer exported. + (move_file): Now takes mode, not struct stat. + * util.c (makedirs): No longer exported. + (move_file): Accept mode of destination, not struct stat. + All callers changed. + Quote file names in diagnostics. + Create parent dir of destination if necessary. + Don't use ENOTDIR. + Don't unlink source; it will be unlinked later. + Unlink destination if FROM is zero. + (create_file): New function. + (copy_file): Accept mode of destination, not struct stat. + All callers changed. + Use create_file to create file. + (ok_to_reverse): Moved here from patch.c. Now accepts format and args; + all callers changed. + (mkdir): 2nd arg is now mode_t, for better compatibility. + (replace_slashes): Ignore slashes at the end of the filename. + + * common.h (noreverse): New decl. + (ok_to_reverse): Remove decl. + + * patch.c (noreverse): Now extern. + (main): New environment var PATCH_VERSION_CONTROL overrides VERSION_CONTROL. + Don't assert(hunk) if we're skipping the patch; we may not have any hunks. + When removing a file, back it up if backups are desired. + Don't chmod output file if input file did not exist. + chmod rej file to input file's mode minus executable bits. + (locate_hunk): Go back to old way of a single fuzz parameter, but + handle it more precisely: context diffs with partial contexts + can only match file ends, since the partial context can occur + only at the start or end of file. + All callers changed. + (create_output_file): Use create_file to create files. + (ok_to_reverse): Move to util.c. + + * inp.c (scan_input, get_input_file): Quote file names in diagnostics. + (get_input_file): Set inerrno if it's not already set. + Don't create file; it's now the caller's responsibility. + (plan_b): Use /dev/null if input size is zero, since it might not exist. + Use create_file to create temporary file. + + * NEWS: Add PATCH_VERSION_CONTROL; DOS port is untested. + + * pc/djgpp/config.h: Add comment for mode_t. + + * pc/djgpp/README: Note that it's not tested. + + * patch.man: PATCH_VERSION_CONTROL overrides VERSION_CONTROL. + +1997-05-15 Paul Eggert <eggert@twinsun.com> + + * configure.in: Add AC_PREREQ(2.12). + (VERSION): Bump to 2.2.8. + (ed_PROGRAM): Rename from ED_PROGRAM. + + * pch.c (prefix_components): Support DOS file names better. + Fix typo that caused fn to almost always yield 0. + + * util.c (<time.h>, <maketime.h>): Include. + (move_file, copy_file): Add support for DOS filenames. + Preserve mode of input files when creating temp files. + Add binary file support. + (doprogram, rmdir): New functions. + (mkdir): Use doprogram. + (replace_slashes): Add support for DOS filenames. + (removedirs): New function. + (init_time)): New function. + (initial_time): New var. + (fetchname): Add support for deleted files, DOS filenames. + + * basename.c (FILESYSTEM_PREFIX_LEN, ISSLASH): + New macros, for DOS port. + (base_name): Use them. + + * addext.c (HAVE_DOS_FILE_NAMES): New macro. + <limits.h>: Include if HAVE_LIMITS_H. + (addext): Handle hosts with DOS file name limits. + + * common.h (LONG_MIN): New macro. + (FILESYSTEM_PREFIX_LEN, ISSLASH): New macros, for DOS port. + (ok_to_create_file): Remove. + (reverse): Now int. + (ok_to_reverse): New function decl. + (O_WRONLY, _O_BINARY, O_BINARY, O_CREAT, O_TRUNC): New macros. + (binary_transput): New var decl. + + * Makefile.in (ed_PROGRAM): Renamed from ED_PROGRAM. + (CONFIG_HDRS, CONFIG_STATUS): New vars. + (SRCS): Add maketime.c, partime.c. + (OBJS): Likewise. + (HDRS): Add maketime.h, partime.h. + (DISTFILES_PC, DISTFILES_PC_DJGPP): New vars. + (Makefile, config.status): Use CONFIG_STATUS, not config.status. + (clean): Remove */*.o. + (dist): Add pc and pc/djgpp subdirectories. + ($(OBJS)): Depend on $(CONFIG_HDRS) instead of config.h. + (maketime.o, partime.o): New rules. + (util.o): Depend on maketime.h. + + * patch.c (main): + Call init_time. Add DEFAULT_VERSION_CONTROL hook for people who + prefer the old ways. Build temp file names before we might invoke cleanup. + Add support for deleted files and clean up the patch-swapping code a bit. + Delete empty ancestors of deleted files. + When creating temporaries, use file modes of original files. + (longopts, get_some_switches): New option --binary. + (get_some_switches): Report non-errno errors with `fatal', not `pfatal'. + (create_output_file): New function, which preserves modes of original files + and supports binary transput. + (init_output, init_reject): Use it. + (ok_to_reverse): New function. + (TMPDIR): New macro. + (make_temp): Use $TMPDIR, $TMP, $TEMP, or TMPDIR, whichever comes first. + + * pch.c (p_says_nonexistent): New var. + (open_patch_file): Add binary transput support. + Apply stat to file names retrieved from user. + Reject them if they don't exist. + (intuit_diff_type): Add support for deleting files. + Don't treat trivial directories any differently. + Avoid stating the same file twice in common case of context diffs. + (prefix_components): Don't treat trivial directories any differently. + Add support for DOS filenames. + (pch_says_nonexistent): New function. + (do_ed_script): Preserve mode of input files when creating temp files. + Add support for binary transput. + + * pch.h (pch_says_nonexistent): New decl. + + * util.h (replace_slashes): No longer exported. + (fetchname): Add support for deleted files. + (copy_file, move_file): Add support for preserving file modes. + (init_time, removedirs): New functions. + + * argmatch.c: Converge with fileutils. + + * backupfile.c: Converge with fileutils. + (find_backup_file_name): Treat .~N~ suffix just like any other suffix + when handling file names that are too long. + + * inp.c: + In messages, put quotes around file names and spaces around "--". + (get_input_file): Allow files to be deleted. Do the expense of + makedirs only if we can't create the file. + (plan_a, plan_b): Add support for binary transput. + + * pc/chdirsaf.c, pc/djgpp/README, pc/djgpp/config.h, pc/djgpp/config.sed, pc/djgpp/configure.bat, pc/quotearg.c: + New file. + + * NEWS: + New methods for removing files; adjust file name intuition again. + Add description of MS-DOS and MS-Windows ports. + + * patch.man: + Simplify file name intuition slightly (no distinction for trivial dirs). + Add --binary. Describe how files and directories are deleted. + Suggest diff -a. Include caveats about what context diffs cannot represent. + +1997-05-06 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Now 2.2.7. + (CPPFLAGS, LDFLAGS, LIBS): If the user has not set any of these vars, + prefer support for large files if available. + + * common.h (_LARGEFILE_SOURCE): Define. + (file_offset): New typedef. + (file_seek, file_tell): New macros. + + * patch.c (main): + Remove empty files by default unless POSIXLY_CORRECT is set. + + * util.c, util.h (Fseek): + Use file_offset instead of long, for portability to large-file hosts. + + * pch.c: (p_base, p_start, next_intuit_at, skip_to, open_patch_file, + intuit_diff_type, another_hunk, incomplete_line, do_ed_script): + Use file_offset instead of long, for portability to large-file hosts. + (prefix_components): Renamed from path_name_components; count only + nontrivial prefix components, and take a 2nd EXISTING arg. + (existing_prefix_components): Remove; subsumed by prefix_components. + (intuit_diff_type): When creating files, try for the creation of the + fewest directories. + + * configure.in (VERSION): Now 2.2.6. + + * pch.c (existing_prefix_components): New function. + (intuit_diff_type): When creating a file, use a name whose existing + directory prefix contains the most nontrivial path name components. + (best_name): Don't check for null 2nd arg. + + * util.h (replace_slashes): New decl. + + * util.c (replace_slashes): Now external. + (fetchname): Don't assume chars are nonnegative. + + * patch.man: + When creating a file, use a name whose existing directory prefix + contains the most nontrivial path name components. + Add advice for creating patches and applying them. + +1997-05-06 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Now 2.2.6. + + * pch.c (existing_prefix_components): New function. + (intuit_diff_type): When creating a file, use a name whose existing + directory prefix contains the most nontrivial path name components. + (best_name): Don't check for null 2nd arg. + + * util.h (replace_slashes): New decl. + * util.c (replace_slashes): Now external. + (fetchname): Don't assume chars are nonnegative. + + * patch.man: Describe above change to pch.c. + Add advice for creating patches and applying them. + +1997-05-05 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Update to 2.2.5. + + * quotearg.h, quotearg.c: New files. + * Makefile.in (SRCS, OBJS, HDRS): Mention new files. + (inp.o, util.o): Now depends on quotearg.h. + (quotearg.o): New makefile rule. + + * common.h (posixly_correct): New var. + * patch.c (main): Initialize it. + If ! posixly_correct, default backup type is now `existing'. + SIMPLE_BACKUP_SUFFIX no longer affects backup type. + (backup): Remove var. + + * util.h: (countdirs): Remove. + (systemic): New decl. + * util.c (move_file): Try making the parent directory of TO + if backup prefix or suffix contain a slash. + (ask): Remove arbitrary limit on size of result. + (systemic): New function. + (mkdir): Work even if arg contains shell metacharacters. + (replace_slashes): Return 0 if none were replaced. + Don't replace slash after . or .. since it's redundant. + (countdirs): Remove. + (makedirs): Ignore mkdir failures. + + * NEWS, patch.man: More POSIXLY_CORRECT adjustments. + Describe new rules for how file names are intuited. + +1997-04-17 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Version 2.2 released. + + * Makefile.in (config.hin): + Remove before building; we always want the timestamp updated. + + * inp.c (get_input_file): + Look for RCS files only if backup_type == numbered_existing. + + * NEWS, patch.man: + Remove mention of never-implemented -V rcs and -V sccs options. + * patch.man: `pathname' -> `file name' + Correct the description of how file names are found in diff headers. + Clarify the distinction between ordinary and unified context diffs. + +1997-04-13 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Update to 2.1.7. + + * patch.c (numeric_optarg): New function. + (get_some_switches): Use it. + + * pch.c (intuit_diff_type): When creating a file, prefer a name whose + existing dir prefix is the longest. + + * util.h (countdirs): New function. + * util.c (replace_slashes, countdirs): New functions. + (makedirs): Use replace_slashes, to be more like countdirs. + + * patch.man: Explain -pN vs -p N. Recommend --new-file. + Explain possible incompatibility with strip count. + +1997-04-10 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Bump to 2.1.6. + (AC_CHECK_HEADERS): Remove stdlib.h (i.e. remove HAVE_STDLIB_H). + + * Makefile.in: (HDRS, patchlevel.h, TAGS, distclean, maintainer-clean): + Don't distribute patchlevel.h; let the user do it. + This works around some obscure (possibly nonexistent?) `make' bugs. + + * common.h (program_name): extern, not XTERN. + (<stdlib.h>): Include if STDC_HEADERS, not if HAVE_STDLIB_H. + (atol, getenv, malloc, realloc): Don't worry whether they're #defined. + + * patch.c (get_some_switches): + Add special hack for backwards compatibility with CVS 1.9. + (-B, -Y, -z): Now set backup_type = simple. + + * NEWS: Fix misspellings; minor reformatting. + * README: Report POSIX.2 compliance. + +1997-04-06 Paul Eggert <eggert@twinsun.com> + + Move all old RCS $Log entries into ChangeLog. + #include all files with < >, not " ". + + * addext.c, argmatch.c, argmatch.h, memchr.c, install-sh: + New files. + * EXTERN.h, INTERN.h: Removed. + * config.hin: Renamed from config.h.in. + + * acconfig.h (NODIR): Remove. + (HAVE_MEMCHR): Add. + + * configure.in (AC_ARG_PROGRAM, AC_PROG_MAKE_SET, HAVE_MEMCHR): Add. + (AC_CHECK_HEADERS): Replaces obsolescent AC_HAVE_HEADERS. + Add stdlib.h, string.h, unistd.h, varargs.h. + Delete obsolete call to AC_UNISTD_H. + (AC_CONFIG_HEADER): Rename config.h.in to config.hin. + (AC_C_CONST): Replaces obsolescent AC_CONST. + (AC_CHECK_FUNC): Check for getopt_long; define LIBOBJS and substitute + for it accordingly. + (AC_CHECK_FUNCS): Replaces obsolescent AC_HAVE_FUNCS. + Add _doprintf, isascii, mktemp, sigaction, sigprocmask, sigsetmask. + Remove strerror. + (AC_FUNC_CLOSEDIR_VOID, AC_FUNC_VPRINTF): Add. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-vendor@FreeBSD.ORG Sat Jul 27 19:57:22 2013 Return-Path: <owner-svn-src-vendor@FreeBSD.ORG> Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9ED854BD; Sat, 27 Jul 2013 19:57:22 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 87C5222BA; Sat, 27 Jul 2013 19:57:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6RJvMBd007692; Sat, 27 Jul 2013 19:57:22 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6RJvL3r007685; Sat, 27 Jul 2013 19:57:21 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201307271957.r6RJvL3r007685@svn.freebsd.org> From: "Pedro F. Giffuni" <pfg@FreeBSD.org> Date: Sat, 27 Jul 2013 19:57:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r253717 - in vendor/patch/dist: . m4 X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree <svn-src-vendor.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>, <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor> List-Post: <mailto:svn-src-vendor@freebsd.org> List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>, <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 27 Jul 2013 19:57:22 -0000 Author: pfg Date: Sat Jul 27 19:57:20 2013 New Revision: 253717 URL: http://svnweb.freebsd.org/changeset/base/253717 Log: Virgin import of patch-2.5.9, the last official GPLv2 release. As in previous imports we dropped the mkinstall and pc directories as they are of no use to us. Differently from previous imports, patch.1 was not renamed and is maintained with its original name (patch.man). If we ever merge this into the main tree, care must be taken to rename it back. Added: vendor/patch/dist/AUTHORS vendor/patch/dist/aclocal.m4 vendor/patch/dist/configure.ac - copied, changed from r253716, vendor/patch/dist/configure.in vendor/patch/dist/dirname.c (contents, props changed) vendor/patch/dist/dirname.h (contents, props changed) vendor/patch/dist/error.c (contents, props changed) vendor/patch/dist/error.h (contents, props changed) vendor/patch/dist/gettext.h (contents, props changed) vendor/patch/dist/m4/ vendor/patch/dist/m4/backupfile.m4 vendor/patch/dist/m4/d-ino.m4 vendor/patch/dist/m4/dirname.m4 vendor/patch/dist/m4/dos.m4 vendor/patch/dist/m4/error.m4 vendor/patch/dist/m4/getopt.m4 vendor/patch/dist/m4/malloc.m4 vendor/patch/dist/m4/mbrtowc.m4 vendor/patch/dist/m4/mbstate_t.m4 vendor/patch/dist/m4/memchr.m4 vendor/patch/dist/m4/mkdir.m4 vendor/patch/dist/m4/onceonly.m4 vendor/patch/dist/m4/quote.m4 vendor/patch/dist/m4/quotearg.m4 vendor/patch/dist/m4/realloc.m4 vendor/patch/dist/m4/rmdir.m4 vendor/patch/dist/m4/setmode.m4 vendor/patch/dist/m4/stdbool.m4 vendor/patch/dist/m4/unlocked-io.m4 vendor/patch/dist/m4/utimbuf.m4 vendor/patch/dist/m4/xalloc.m4 vendor/patch/dist/malloc.c (contents, props changed) vendor/patch/dist/mkdir.c (contents, props changed) vendor/patch/dist/patch.man - copied, changed from r253716, vendor/patch/dist/patch.1 vendor/patch/dist/quote.c (contents, props changed) vendor/patch/dist/quote.h (contents, props changed) vendor/patch/dist/quotesys.c (contents, props changed) vendor/patch/dist/quotesys.h (contents, props changed) vendor/patch/dist/realloc.c (contents, props changed) vendor/patch/dist/rmdir.c (contents, props changed) vendor/patch/dist/stdbool.h.in (contents, props changed) vendor/patch/dist/strcasecmp.c (contents, props changed) vendor/patch/dist/strncasecmp.c (contents, props changed) vendor/patch/dist/unlocked-io.h (contents, props changed) vendor/patch/dist/xalloc.h (contents, props changed) vendor/patch/dist/xmalloc.c (contents, props changed) Deleted: vendor/patch/dist/acconfig.h vendor/patch/dist/configure.in vendor/patch/dist/patch.1 vendor/patch/dist/rename.c Modified: vendor/patch/dist/COPYING (contents, props changed) vendor/patch/dist/ChangeLog vendor/patch/dist/INSTALL (contents, props changed) vendor/patch/dist/Makefile.in vendor/patch/dist/NEWS (contents, props changed) vendor/patch/dist/README (contents, props changed) vendor/patch/dist/addext.c (contents, props changed) vendor/patch/dist/argmatch.c (contents, props changed) vendor/patch/dist/argmatch.h (contents, props changed) vendor/patch/dist/backupfile.c (contents, props changed) vendor/patch/dist/backupfile.h (contents, props changed) vendor/patch/dist/basename.c (contents, props changed) vendor/patch/dist/common.h (contents, props changed) vendor/patch/dist/config.hin vendor/patch/dist/configure vendor/patch/dist/getopt.c (contents, props changed) vendor/patch/dist/getopt.h (contents, props changed) vendor/patch/dist/getopt1.c (contents, props changed) vendor/patch/dist/inp.c (contents, props changed) vendor/patch/dist/inp.h (contents, props changed) vendor/patch/dist/install-sh vendor/patch/dist/maketime.c (contents, props changed) vendor/patch/dist/maketime.h (contents, props changed) vendor/patch/dist/memchr.c (contents, props changed) vendor/patch/dist/partime.c (contents, props changed) vendor/patch/dist/partime.h (contents, props changed) vendor/patch/dist/patch.c (contents, props changed) vendor/patch/dist/pch.c (contents, props changed) vendor/patch/dist/pch.h (contents, props changed) vendor/patch/dist/quotearg.c (contents, props changed) vendor/patch/dist/quotearg.h (contents, props changed) vendor/patch/dist/util.c (contents, props changed) vendor/patch/dist/util.h (contents, props changed) vendor/patch/dist/version.c (contents, props changed) vendor/patch/dist/version.h (contents, props changed) Added: vendor/patch/dist/AUTHORS ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/patch/dist/AUTHORS Sat Jul 27 19:57:20 2013 (r253717) @@ -0,0 +1,9 @@ +Larry Wall wrote the original version of `patch'. + +Paul Eggert removed arbitrary limits; added support for binary +files, setting file times, and deleting files; and made it conform +better to POSIX. + +Wayne Davison added unidiff support. + +David MacKenzie added configuration and backup support. Modified: vendor/patch/dist/COPYING ============================================================================== --- vendor/patch/dist/COPYING Sat Jul 27 18:42:46 2013 (r253716) +++ vendor/patch/dist/COPYING Sat Jul 27 19:57:20 2013 (r253717) @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -291,7 +291,7 @@ convey the exclusion of warranty; and ea the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> + Copyright (C) <year> <name of author> 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 @@ -313,7 +313,7 @@ Also add information on how to contact y If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. Modified: vendor/patch/dist/ChangeLog ============================================================================== --- vendor/patch/dist/ChangeLog Sat Jul 27 18:42:46 2013 (r253716) +++ vendor/patch/dist/ChangeLog Sat Jul 27 19:57:20 2013 (r253717) @@ -1,3 +1,573 @@ +2003-05-20 Paul Eggert <eggert@twinsun.com> + + * NEWS, configure.ac (AC_INIT): Version 2.5.9 released. + + * Makefile.in (HDRS): Add gettext.h. + + Use bool, not int, for booleans. + + * pch.c (pch_says_nonexistent): Returns int, not bool. + + * configure.ac: Add AM_STDBOOL_H. + + * Makefile.in (MISC): Add stdbool.h.in. + (stdbool.h): New rule. + (ACINCLUDE_INPUTS): Add stdbool.m4. + (mostlyclean): Remove stdbool.h. + (COMMON): New macro; use it instead of common.h for dependencies. + + * common.h: Include <stdbool.h>. + Remove TRUE, FALSE, bool. All uses changed to standard names. + + * common.h (reverse, set_time, set_utc): + Use bool, not int, for booleans. + * pch.c (p_strip_trailing_cr, p_pass_comments_through, + prefix_components, pget_line, re_patch, + there_is_another_patch, intuit_diff_type, scan_linenum, + another_hunk, pget_line, pch_timestamp): Likewise. + * inp.h (ifetch): Likewise. + * util.c (move_file, version_controller, version_get, ok_to_reverse, + set_signals): Likewise. + * inp.c (report_revision, get_input_file, plan_a, plan_b, ifetch): + Likewise. + * util.h (ok_to_reverse, version_controller, version_get, + move_file, set_signals): Likewise. + * pch.h (another_hunk, pch_says_nonexistent, pch_timestamp): + Likewise. + * patch.c (struct outstate, numeric_string, make_backups, + backup_if_mismatch, remove_empty_files, + reverse_flag_specified, main, reinitialize_almost_everything, + get_some_switches, apply_hunk, init_output, copy_till): + Likewise. + +2003-05-18 Paul Eggert <eggert@twinsun.com> + + * pch.c (p_pass_comments_through): New var. + (pget_line): Accept new arg for pass_comments_through. + All callers changed. + (there_is_another_patch): Do not suggest -p for ed diffs. + (intuit_diff_type): Check ed command for correct syntax. + Do not set p_strip_trailing_cr merely because a -p line contains a CR. + (get_ed_command_letter): New function. + (do_ed_script): Use it. Do not treat '#' data lines as comments in ed + scripts. + + * util.c (move_file): + Don't assume that when 'rename(A,B)' succeeds then A no + longer exists. This is not true of POSIX 1003.1-2001 rename when A + and B are links to the same file. + (fetchname): Fix test for file names with internal spaces. + + * version.c: Don't include patchlevel.h. + (version): Use PACKAGE_NAME and PACKAGE_VERSION instead of obsolete + PROGRAM_NAME and PATCH_VERSION. + (copyright_string): Bump to 2003. + + * common.h (FILESYSTEM_PREFIX_LEN, ISSLASH): + Remove; now done by 'configure'. + (PROGRAM_NAME): Remove; now done by 'configure' as PACKAGE_NAME. + + * patch.c: Do not include <exitfail.h>. + (main): Set xalloc_exit_failure, not exit_failure. + Add "&& !skip_rest_of_patch" when deciding to continue ed scripts. + (option_help): Use PACKAGE_BUGREPORT rather than hardcoding. + + * configure.ac (AC_PREREQ): Bump to 2.57. + (AC_GNU_SOURCE): Add, early on. + (gl_BACKUPFILE, gl_DIRNAME, gl_ERROR, gl_FUNC_MEMCHR, gl_FUNC_RMDIR, + gl_GETOPT, gl_PREREQ_XMALLOC, gl_QUOTE, gl_QUOTEARG): Add. + (jm_PREREQ_ADDEXT): Add, with definition. + (jm_PREREQ_DIRNAME, jm_PREREQ_ERROR, jm_PREREQ_MEMCHR, + jm_PREREQ_QUOTEARG): Remove. + (AC_REPLACE_FUNCS): Remove memchr, rename, rmdir). + (jm_FUNC_GLIBC_UNLOCKED_IO, jm_AC_DOS): Add. + (jm_CHECK_TYPE_STRUCT_DIRENT_D_INO): Do not call directly. + (AC_OUTPUT): Use new style, with AC_CONFIG_FILES. + + Update to current CVS gnulib. + + * exitfail.c, exitfail.h, patchlevel.h, rename.c, m4/c-bs-a.m4, + m4/jm-glibc-io.m4, m4/prereq.m4: Remove. + * m4/backupfile.m4, m4/dirname.m4, m4/dos.m4, m4/getopt.m4, + m4/memchr.m4, m4/onceonly.m4, m4/quote.m4, m4/quotearg.m4, + m4/rmdir.m4, m4/unlocked-io.m4, m4/xalloc.m4: New files. + * Makefile.in (LIBSRCS): Move error.c here from SRCS. + Remove rename.c. + (OBJS): Remove error.$(OBJEXT). + (HDRS): Remove exitfail.h, patchlevel.h. + (ACINCLUDE_INPUTS): Remove c-bs-a.m4, jm-glibc-io.m4, prereq.m4. + Add backupfile.m4, dirname.m4, dos.m4, getopt.m4, memchr.m4, + onceonly.m4, quote.m4, quotearg.m4, rmdir.m4, unlocked-io.m4, + xalloc.m4. + (patchlevel.h): Remove. All uses removed. + (argmatch.$(OBJEXT), error.$(OBJEXT), quotesys.$(OBJEXT)), + xmalloc.$(OBJEXT)): Depend on gettext.h. + (dirname.$(OBJEXT), quote.$(OBJEXT), strncasecmp.$(OBJEXT)): New rules. + (patch.$(OBJEXT), xmalloc.$(OBJEXT)): Remove exitfail.h. + (rename.$(OBJEXT)): Remove. + (version.$(OBJEXT)): Remove util.h. + (xmalloc.$(OBJEXT)): Add error.h. + +2002-11-23 Paul Eggert <eggert@twinsun.com> + + * patch.c (main): Don't check for zero-sized file after 'ed' + when skipping patch. From Michael Fedrowitz. + +2002-06-03 Paul Eggert <eggert@twinsun.com> + + * configure.ac (AC_OUTPUT): Use new form, with AC_CONFIG_FILES, + instead of obsolescent form. Patch from Art Haas. + + * pch.c (intuit_diff_type): Do not warn about trailing white space + after Prereq: word. Bug reported by Mike Castle. + +2002-06-02 Paul Eggert <eggert@twinsun.com> + + * NEWS, configure.ac (AC_INIT): Version 2.5.8 released. + + * README: POSIX.2 -> POSIX. + * inp.c (report_revision): Don't modify 'revision', since + it gets freed later. Bug reported by Mike Castle. + +2002-05-30 Paul Eggert <eggert@twinsun.com> + + * NEWS, configure.ac (AC_INIT): Version 2.5.7 released. + + * Makefile.in (MISC): Remove README-alpha. + (patchlevel.h): Depend on configure, not configure.ac. + + * INSTALL: Upgrade to Autoconf 2.53 version. + +2002-05-28 Paul Eggert <eggert@twinsun.com> + + * patch.c (end_defined, apply_hunk): Output #endif without + the comment, as POSIX 1003.1-2001 requires. + + * pch.c (there_is_another_patch): Flush stderr after perror. + + * NEWS, configure.ac (AC_INIT): Version 2.5.6 released. + + * strcasecmp.c, strncasecmp.c: New files, taken from fileutils. + * config.guess, config.sub: Remove. + * Makefile.in (LIBSRCS): Add strcasecmp.c, strncasecmp.c. + (MISC): Remove config.guess, config.sub. + + The code already assumes C89 or better, so remove K&R stuff. + * common.h (volatile): Remove. + (GENERIC_OBJECT): Remove; all uses changed to 'void'. + (PARAMS): Remove; all uses changed to prototypes. + * configure.ac (AC_PROG_CC_STDC): Add. + * util.c (vararg_start): Remove. All uses changed to va_start. + Always include <stdarg.h>. + + * configure.ac (AC_CANONICAL_HOST): Remove. + (AC_REPLACE_FUNCS): Add strncasecmp. + (AC_CHECK_DECLS): Add mktemp. + + * patch.c (main): Remove useless prototype decl. + (mktemp): Don't declare if HAVE_DECL_MKTEMP || defined mktemp. + (make_temp): Now accepts char, not int. + +2002-05-26 Paul Eggert <eggert@twinsun.com> + + * patch.c (not_defined): Prepend newline. All uses changed. + (apply_hunk): Fix bug: -D was outputting #ifdef when it should + have been outputting #ifndef. Bug report and partial fix by + Jason Short. + + * pch.c (intuit_diff_type): When reading an ed diff, don't use + indent and trailing-CR-ness of "." line; instead, use that of the + command. Bug reported by Anthony Towns; partial fix by Michael + Fedrowitz. + (intuit_diff_type): If the index line exists, don't report a + missing header. Fix by Chip Salzenberg. + +2002-05-26 Alessandro Rubini <rubini@gnu.org> + + * patch.c (locate_hunk): Fixed updating of last_offset. + +2002-05-25 Paul Eggert <eggert@twinsun.com> + + * NEWS, README: Diffutils doc is up to date now. + Bug reporting address is now <bug-patch@gnu.org>. + * README: Describe '--disable-largefile'. + + * NEWS-alpha, dirname.c, dirname.h, exitfail.c, exitfail.h, + quote.c, quote.h, unlocked-io.h: New files, taken from diffutils + and fileutils. + + * argmatch.c: [STDC_HEADERS]: Include stdlib.h, for 'exit'. + + * addext.c, argmatch.c, argmatch.h, backupfile.c, basename.c: + Update from diffutils and fileutils. + + * ansi2knr.1, ansi2knr.c: Remove. + + * common.h: HAVE_SETMODE && O_BINARY -> HAVE_SETMODE_DOS. + * patch.c (usage): Likewise. + * pch.c (open_patch_file): Likewise. + + * configure.ac: Renamed from configure.in. Add copyright notice. + (AC_PREREQ): Bump to 2.53. + (AC_INIT): Use 2.5x style. + (AC_CONFIG_SRCDIR): Add. + (PACKAGE, VERSION): Remove. + (AC_C_PROTOTYPES): Use this instead of AM_C_PROTOTYPES. + (jm_CHECK_TYPE_STRUCT_UTIMBUF): Use this instead of jm_STRUCT_UTIMBUF. + (jm_PREREQ_ADDEXT, jm_PREREQ_DIRNAME, jm_PREREQ_ERROR, + jm_PREREQ_MEMCHR, jm_PREREQ_QUOTEARG): Add. + (AC_CHECK_DECLS): Add free, getenv, malloc. + (AC_CHECK_FUNCS): Remove setmode. + (AC_FUNC_SETMODE_DOS): Add. + (jm_CHECK_TYPE_STRUCT_DIRENT_D_INO): Use this instead of + jm_STRUCT_DIRENT_D_INO. + + * Makefile.in (OBJEXT): New var. + (PACKAGE_NAME): Renamed from PACKAGE. All uses changed. + (PACKAGE_VERSION): Renamed from VERSION. All uses changed. + (U): Remove. All uses of "$U.o" changed to ".$(OBJEXT)". + (LIBSRCS): REmove getopt.c getopt1.c. Add mkdir.c, rmdir.c. + (SRCS): Add dirname.c, exitfail.c, getopt.c, getopt1.c, quote.c. + Remove mkdir.c. + (OBJS): Keep in sync with SRCS. + (HDRS): Remove basename.h. + Add dirname.h, exitfail.h, quote.h, unlocked-io.h. + (MISC, configure, config.hin, patchlevel.h): + configure.ac renamed from configure.in. + (MISC): Add README-alpha. Remove ansi2knr.1, ansi2knr.c. + (.c.$(OBJEXT)): Renamed from .c.o. + (ACINCLUDE_INPUTS): Add c-bs-a.m4, error.m4, jm-glibc-io.m4, + mbstate_t.m4, mkdir.m4, mbrtowc.m4, prereq.m4, setmode.m4. + Remove ccstdc.m4, inttypes_h.m4, largefile.m4, protos.m4. + (mostlyclean): Don't clean ansi2knr. + (ansi2knr.o, ansi2knr): Remove. + Redo dependencies. + + * patch.c: Include <exitfail.h>. + (main): Initialize exit_failure. + + * patch.man: Update copyright notice. + + * pch.c, util.c: Include <dirname.h>, not <basename.h>. + + * version.c (copyright_string): Update copyright notice. + +2002-02-17 Paul Eggert <eggert@twinsun.com> + + * partime.c (parse_pattern_letter): Don't overrun buffer if it + contains only alphanumerics. Bug reported by Winni + <Winni470@gmx.net>. + +2001-07-28 Paul Eggert <eggert@sic.twinsun.com> + + * util.c (fetchname), NEWS: + Allow file names with internal spaces, so long as they + don't contain tabs. + + * pch.c (intuit_diff_type): Do not allow Prereq with multiple words. + + * configure.in (AC_PREREQ): Bump to 2.50. + (AC_CHECK_FUNCS): Remove fseeko. + (AC_FUNC_FSEEKO): Add. + * Makefile.in (ACINCLUDE_INPUTS): + Remove largefile.m4; no longer needed with Autoconf 2.50. + +2001-02-07 "Tony E. Bennett" <tbennett@nvidia.com> + + * util.c (PERFORCE_CO): New var. + (version_controller): Support Perforce. + * patch.man: Document this. + +2000-06-30 Paul Eggert <eggert@sic.twinsun.com> + + * patch.man: Ignore comment lines. + + * NEWS, pch.c: Ignore lines beginning with "#". + +1999-10-24 Paul Eggert <eggert@twinsun.com> + + * pch.c (another_hunk): Report a fatal error if a regular + context hunk's pattern has a different number of unchanged + lines than the replacement. + +1999-10-18 Paul Eggert <eggert@twinsun.com> + + * patch.c (main): If we skipped an ed patch, exit with nonzero status. + +1999-10-17 Paul Eggert <eggert@twinsun.com> + + * patch.c (main): Apply do_ed_script even if dry_run, because + we need to make progress on the patch file. + * pch.c (do_ed_script): If skip_rest_of_patch is nonzero, + gobble up the patch without any other side effect. + +1999-10-12 Paul Eggert <eggert@twinsun.com> + + * NEWS, README: New bug reporting address. + * NEWS: Report change in 2.5.4 that we forgot to document. + * README: Document `configure --disable-largefile'. + + * basename.c, COPYING, getopt.c, getopt.h, getopt1.c, m4/largefile.m4: + Update to latest version. + * Makefile.in (basename$U.o): Depend on basename.h. + (config.hin): Depend on $(srcdir)/aclocal.m4. + + * ansi2knr.c, maketime.c, mkinstalldirs, partime.c: Fix $Id. + + FreeBSD has an unrelated setmode function; work around this. + * common.h (binary_transput): Don't declare unless O_BINARY. + * patch.c (option_help, get_some_switches): + Don't use setmode unless O_BINARY. + * pch.c (open_patch_file): Don't invoke setmode unless O_BINARY. + + Fix incompatiblities with error.c. + * common.h (program_name): Now XTERN char *, for compatibility + with error.c. All uses changed. + (PROGRAM_NAME): New macro. + (PARAMS): Use ANSI C version only if defined PROTOTYPES + || (defined __STDC__ && __STDC__), for compatibilty with error.c. + * util.c (vararg_start): Likewise. + * patch.c (program_name): Remove. + (main): Initialize program_name. + * version.c (version): Print PROGRAM_NAME, not program_name. + + Accommodate mingw32 port, which has one-argument mkdir (yuck!) + and no geteuid. + * m4/mkdir.m4: New file. + * Makefile.in (ACINCLUDE_INPUTS): Add $(M4DIR)/mkdir.m4. + * configure.in (AC_CHECK_FUNCS): Add geteuid, getuid. + (PATCH_FUNC_MKDIR_TAKES_ONE_ARG): Add. + * common.h (mkdir): Define if mkdir takes one arg. + (geteuid): New macro, if not already defined. + +1999-10-11 Christopher R. Gabriel <cgabriel@tin.it> + + * patch.c (option_help): Updated bug report address + * configure.in (VERSION): Version 2.5.5 released. + +1999-09-01 Paul Eggert <eggert@twinsun.com> + + * patch.c (main): Default simple_backup_suffix to ".orig". + +1999-10-08 Paul Eggert <eggert@twinsun.com> + + * patch.man: Make it clear that `patch -o F' should not be + used if F is one of the files to be patched. + +1999-08-30 Paul Eggert <eggert@twinsun.com> + + Version 2.5.4 fixes a few minor bugs, converts C sources to + ANSI prototypes, and modernizes auxiliary sources and autoconf + scripts. + + * configure.in (VERSION): Version 2.5.4 released. + (AC_CANONICAL_HOST): Add. + (AC_SYS_LARGEFILE): Add, replacing inline code. + (AC_EXEEXT): Add. + (jm_AC_HEADER_INTTYPES_H): Add, replacing inline code. + (AC_TYPE_PID_T): Add. + (jm_STRUCT_UTIMBUF): Add, replacing inline code. + (HAVE_MEMCHR): Remove obsolescent test; nobody uses NetBSD 1.0 now. + (getopt_long): Append $U to object file basenames. + (AC_CHECK_FUNCS): Add fseeko, setmode. Remove mkdir. + (AC_REPLACE_FUNCS): Add mkdir, rmdir. + (jm_STRUCT_DIRENT_D_INO): Add, replacing inline code. + + * Makefile.in (EXEEXT): New macro. + (mandir): New macro. + (man1dir): Define in terms of mandir. + (SRCS): Add mkdir.c, rmdir.c. + (OBJS): Change .o to $U.o for addext, argmatch, backupfile, basename, + error, inp, patch ,,pch, quotearg, util, version, xmalloc. + (HDRS): Add basename.h, patchlevel.h. + (MISC): Add ansi2knr.1, config.guess, config.sub. + (MISC, config.hin): Remove acconfig.h; no longer needed. + (DISTFILES_M4): New macro. + (all): patch -> patch$(EXEEXT). + (patch$(EXEEXT)): Renamed from patch. All uses changed. + (uninstall): Remove manual page. + (configure): Depend on aclocal.m4. + (M4DIR, ACINCLUDE_INPUTS): New macros. + ($(srcdir)/aclocal.m4): New rule. + (patchlevel.h): Depend on configure.in, not Makefile, + since we now distribute it. + (distclean): Don't remove patchlevel.h. + (dist): Distribute $(DISTFILES_M4). + (addext_.c argmatch_.c backupfile_.c basename_.c error_.c + getopt_.c getopt1_.c inp_.c malloc_.c mkdir_.c patch_.c pch_.c + rename_.c util_.c version_.c xmalloc_.c): Depend on ansi2knr. + Update dependencies to match sources. + + * common.h (_LARGEFILE_SOURCE): Remove; now autoconfigured. + (file_offset): Depend on HAVE_FSEEKO, not _LFS_LARGEFILE. + + * patch.c (version_control_context): New variable. + Convert to ANSI prototypes. + Adjust to new argmatch calling convention. + Similarly for get_version. + Complain about creating an existing file only if + pch_says_nonexistent returns 2 (not merely nonzero). + Similarly for time mismatch check. + (get_some_switches): Adjust to new get_version calling convention. + Similarly for argmatch. + + * pch.c (<basename.h>): Include. + (intuit_diff_type): Improve quality of test for empty file. + (another_hunk): Don't assume off_t is no longer than long. + + * util.h (backup_type): New decl. + * util.c (<basename.h>): Include. + (move_file): Adjust to new find_backup_file_name convention. + (doprogram, mkdir, rmdir): Remove; now in separate files. + (fetchame): Match "/dev/null", not NULL_DEVICE. + Ignore names that don't have enough slashes to strip off. + + * version.c: Update copyright notice. + +1998-03-20 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Bump to 2.5.3. + * quotearg.h (quotearg_quoting_options): + Remove; it ran afoul of the Borland C compiler. + Its address is now represented by the null pointer. + * quotearg.c (default_quoting_options): + Renamed from quotearg_quoting_options, + and now static instead of extern. + (clone_quoting_options, get_quoting_style, set_quoting_style, + set_char_quoting, quotearg_buffer): + Use default_quoting_options when passed a null pointer. + * patch.c (main, get_some_switches): + Pass a null pointer instead of address of quotearg_quoting_options. + +1998-03-17 Paul Eggert <eggert@twinsun.com> + + * patch.c (option_help): Update bug reporting address to gnu.org. + * patch.man: Fix copyright and bug reporting address. + +1998-03-16 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Bump to 2.5.2. + (AC_CHECK_FUNCS): Add strerror. + (jm_FUNC_MALLOC, jm_FUNC_REALLOC): Add. + (AM_C_PROTOTYPES): Add. + + * NEWS, patch.c (longopts, get_some_switches), patch.man: + Add --quoting-style, --posix options. + + * Makefile.in (LIBSRCS): Add malloc.c, realloc.c. + (SRCS): Add error.c, quotesys.c, xmalloc.c. + (OBJS): Likewise. + (HDRS): Add error.h, quotesys.h, xalloc.h. + (MISC): Add AUTHORS, aclocal.m4, ansi2knr.c. + (clean): Use mostlyclean rule. + (argmatch.o, inp.o, patch.o, pch.o): Now also depends on quotearg.h. + (inp.o, patch.o, util.o): Now also depends on xalloc.h. + (error.o, quotearg.o, quotesys.o, xmalloc.o, + ansi2knr.o, ansi2knr, quotearg_.c, .c_.c): New rules. + (U): New macro. + (OBJS, quotearg$U.o): Rename quotearg.o to quotearg$U.o. + (mostlyclean): Remove ansi2knr, *_.c. + (.SUFFIXES): Add _.c. + + * acconfig.h (PROTOTYPES): New undef. + + * acconfig.h, configure.in (HAVE_INTTYPES_H, malloc, realloc): + New macros. + + * aclocal.m4, error.c, error.h, malloc.c, + quotearg.h, quotearg.c, realloc.c, xalloc.h, xmalloc.c: New files. + + * argmatch.c: Include <sys/types.h> before <argmatch.h>. + Include <quotearg.h>. + + * argmatch.c (invalid_arg), + inp.c (scan_input, report_revision, too_many_lines, get_input_file, + plan_a), + patch.c (main, get_some_switches, numeric_string), + pch.c (open_patch_file, intuit_diff_type, do_ed_script): + util.c (move_file, create_file, copy_file, version_get, removedirs): + Quote output operands properly. + + * common.h: Include <inttypes.h> if available. + (CHAR_BIT, TYPE_SIGNED, TYPE_MINIMUM, TYPE_MAXIMUM, + CHAR_MAX, INT_MAX, LONG_MIN, SIZE_MAX, O_EXCL): New macros. + (TMPINNAME_needs_removal, TMPOUTNAME_needs_removal, + TMPPATNAME_needs_removal): New variables. + (xmalloc): Remove decl; now in xalloc.h. + + * inp.c: Include <quotearg.h>, <xalloc.h>. + + * inp.c (get_input_file), + pch.c (intuit_diff_type), + util.c (version_controller): + Don't do diff operation if diffbuf is null; used by ClearCase support. + + * inp.c (plan_b), + patch.c (init_reject), + pch.c (open_patch_file, do_ed_script): + Create temporary file with O_EXCL to avoid races. + + * patch.c: Include <quotearg.h>, <xalloc.h>. + (create_output_file, init_output): New open_flags arg. + All callers changed. + (init_reject): No longer takes filename arg. All callers changed. + (remove_if_needed): New function. + (cleanup): Use it to remove temporary files only if needed. + (TMPREJNAME_needs_removal): New var. + (main): Set xalloc_fail_func to memory_fatal; needed for xalloc. + Initialize quoting style from QUOTING_STYLE. + (longopts, get_some_switches): Offset longarg options by CHAR_MAX, + not 128; this is needed for EBCDIC ports. + + * patch.c (main, locate_hunk, abort_hunk, spew_output), + pch.c (there_is_another_patch, intuit_diff_type, malformed, + another_hunk): + The LINENUM type now might be longer than long, + so print and read line numbers more carefully. + + * patch.c (main), + pch.c (there_is_another_patch): + util.c (fetchname): + strippath now defaults to -1, so that we can distinguish unset + value from largest possible. + + * patch.man: Clarify how file name is chosen from candidates. + + * pch.c: Include <quotearg.h>. + (p_strip_trailing_cr): New variable. + (scan_linenum): New function. + (pget_line, re_patch, there_is_another_patch, intuit_diff_type, + get_line): Strip trailing CRs from context diffs that need this. + (best_name): Use SIZE_MAX instead of (size_t) -1 for max size_t. + + * quotesys.c, quotearg.h: Renamed from quotearg.c and quotearg.h. + All uses changed. + * quotesys.h (__QUOTESYS_P): Renamed from __QUOTEARG_P. + + * util.c: Include <quotearg.h>, <xalloc.h>. + (raise): Don't define if already defined. + (move_file): New arg from_needs_removal. All callers changed. + (copy_file): New arg to_flags. All callers changed. + (CLEARTOOL_CO): New constant. + (version_controller): Add ClearCase support. + (format_linenum): New function. + (fetchname): Allow any POSIX.1 time zone spec, which means + any local time offset in the range -25:00 < offset < +26:00. + Ignore the name if it doesn't have enough slashes to strip off. + (xmalloc): Remove; now in xmalloc.c. + + * util.h (LINENUM_LENGTH_BOUND): New macro. + (format_linenum): New decl. + + * version.c (copyright_string): Update years of copyrights. + +1997-09-03 Paul Eggert <eggert@twinsun.com> + + * configure.in (VERSION): Bump to 2.5.1. + * inp.c (re_input): Don't free buffers twice when input is garbled. + * patch.c (main): If skipping patch and Plan A fails, don't + bother trying Plan B. + 1997-08-31 Paul Eggert <eggert@twinsun.com> * configure.in (VERSION): Version 2.5 released. @@ -1696,9 +2266,26 @@ Sun Dec 17 17:29:48 1989 Jim Kingdon ( 1984-11-09 Larry Wall <sdcrdcf!lwall> * patch.c: Initial revision - -Local Variables: -mode: indented-text -left-margin: 8 -version-control: never -end: + + +Copyright (C) 1984, 1985, 1986, 1987, 1988 Larry Wall. + +Copyright (C) 1989, 1990, 1991, 1992, 1993, 1997, 1998, 1999, 2000, 2001, +2002 Free Software Foundation, Inc. + +This file is part of GNU Patch. + +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 +the Free Software Foundation; either version 2, or (at your option) +any later version. + +This program is distributed in the hope that they will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; see the file COPYING. If not, write to +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. Modified: vendor/patch/dist/INSTALL ============================================================================== --- vendor/patch/dist/INSTALL Sat Jul 27 18:42:46 2013 (r253716) +++ vendor/patch/dist/INSTALL Sat Jul 27 19:57:20 2013 (r253717) @@ -1,3 +1,9 @@ +Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software +Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + Basic Installation ================== @@ -8,20 +14,27 @@ various system-dependent variables used those values to create a `Makefile' in each directory of the package. It may also create one or more `.h' files containing system-dependent definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, a file -`config.cache' that saves the results of its tests to speed up -reconfiguring, and a file `config.log' containing compiler output -(useful mainly for debugging `configure'). +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. (Caching is +disabled by default to prevent problems with accidental use of stale +cache files.) If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail diffs or instructions to the address given in the `README' so they can -be considered for the next release. If at some point `config.cache' -contains results you don't want to keep, you may remove or edit it. - - The file `configure.in' is used to create `configure' by a program -called `autoconf'. You only need `configure.in' if you want to change -it or regenerate `configure' using a newer version of `autoconf'. +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You only need +`configure.ac' if you want to change it or regenerate `configure' using +a newer version of `autoconf'. The simplest way to compile this package is: @@ -55,14 +68,15 @@ Compilers and Options ===================== Some systems require unusual options for compilation or linking that -the `configure' script does not know about. You can give `configure' -initial values for variables by setting them in the environment. Using -a Bourne-compatible shell, you can do that on the command line like -this: - CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for variables by setting +them in the environment. You can do that on the command line like this: -Or on systems that have the `env' program, you can do it like this: - env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure + ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + + *Note Defining Variables::, for more details. Compiling For Multiple Architectures ==================================== @@ -75,11 +89,11 @@ directory where you want the object file the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not supports the `VPATH' -variable, you have to compile the package for one architecture at a time -in the source code directory. After you have installed the package for -one architecture, use `make distclean' before reconfiguring for another -architecture. + If you have to use a `make' that does not support the `VPATH' +variable, you have to compile the package for one architecture at a +time in the source code directory. After you have installed the +package for one architecture, use `make distclean' before reconfiguring +for another architecture. Installation Names ================== @@ -122,22 +136,32 @@ you can use the `configure' options `--x Specifying the System Type ========================== - There may be some features `configure' can not figure out -automatically, but needs to determine by the type of host the package -will run on. Usually `configure' can figure that out, but if it prints -a message saying it can not guess the host type, give it the -`--host=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name with three fields: + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + CPU-COMPANY-SYSTEM -See the file `config.sub' for the possible values of each field. If +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't -need to know the host type. +need to know the machine type. - If you are building compiler tools for cross-compiling, you can also + If you are _building_ compiler tools for cross-compiling, you should use the `--target=TYPE' option to select the type of system they will -produce code for and the `--build=TYPE' option to select the type of -system on which you are compiling the package. +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. Sharing Defaults ================ @@ -150,20 +174,44 @@ default values for variables like `CC', `CONFIG_SITE' environment variable to the location of the site script. A warning: not all `configure' scripts look for a site script. -Operation Controls +Defining Variables ================== + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +will cause the specified gcc to be used as the C compiler (unless it is +overridden in the site shell script). + +`configure' Invocation +====================== + `configure' recognizes the following options to control how it operates. -`--cache-file=FILE' - Use and save the results of the tests in FILE instead of - `./config.cache'. Set FILE to `/dev/null' to disable caching, for - debugging `configure'. - `--help' +`-h' Print a summary of the options to `configure', and exit. +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + `--quiet' `--silent' `-q' @@ -175,9 +223,6 @@ operates. Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. -`--version' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`configure' also accepts some other, not widely useful, options. +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. Modified: vendor/patch/dist/Makefile.in ============================================================================== --- vendor/patch/dist/Makefile.in Sat Jul 27 18:42:46 2013 (r253716) +++ vendor/patch/dist/Makefile.in Sat Jul 27 19:57:20 2013 (r253717) @@ -1,5 +1,7 @@ # Makefile for GNU patch. -# Copyright 1993, 1997 Free Software Foundation, Inc. + +# Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003 Free Software +# Foundation, Inc. # 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 @@ -33,11 +35,13 @@ transform = @program_transform_name@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ DEFS = @DEFS@ +EXEEXT = @EXEEXT@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ +OBJEXT = @OBJEXT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -45,7 +49,8 @@ exec_prefix = @exec_prefix@ bindir = $(exec_prefix)/bin # Where to put the manual pages. -man1dir = $(prefix)/man/man1 +mandir = @mandir@ +man1dir = $(mandir)/man1 # Extension (including `.') for the manual page filenames. man1ext = .1 @@ -56,24 +61,42 @@ CONFIG_STATUS = config.status SHELL = /bin/sh -LIBSRCS = getopt.c getopt1.c memchr.c rename.c -SRCS = addext.c argmatch.c backupfile.c basename.c inp.c maketime.c \ - partime.c patch.c pch.c quotearg.c util.c version.c $(LIBSRCS) -OBJS = addext.o argmatch.o backupfile.o basename.o inp.o maketime.o \ - partime.o patch.o pch.o quotearg.o util.o version.o $(LIBOBJS) -HDRS = argmatch.h backupfile.h common.h getopt.h \ - inp.h maketime.h partime.h pch.h quotearg.h util.h version.h -MISC = COPYING ChangeLog INSTALL Makefile.in NEWS README \ - acconfig.h config.hin configure configure.in \ - install-sh mkinstalldirs patch.man +LIBSRCS = error.c malloc.c memchr.c mkdir.c \ + realloc.c rmdir.c strcasecmp.c strncasecmp.c +SRCS = $(LIBSRCS) \ + addext.c argmatch.c backupfile.c \ + basename.c dirname.c \ + getopt.c getopt1.c inp.c \ + maketime.c partime.c \ + patch.c pch.c \ + quote.c quotearg.c quotesys.c \ + util.c version.c xmalloc.c +OBJS = $(LIBOBJS) \ + addext.$(OBJEXT) argmatch.$(OBJEXT) backupfile.$(OBJEXT) \ + basename.$(OBJEXT) dirname.$(OBJEXT) \ + getopt.$(OBJEXT) getopt1.$(OBJEXT) inp.$(OBJEXT) \ + maketime.$(OBJEXT) partime.$(OBJEXT) \ + patch.$(OBJEXT) pch.$(OBJEXT) \ + quote.$(OBJEXT) quotearg.$(OBJEXT) quotesys.$(OBJEXT) \ + util.$(OBJEXT) version.$(OBJEXT) xmalloc.$(OBJEXT) +HDRS = argmatch.h backupfile.h common.h dirname.h \ + error.h getopt.h gettext.h \ + inp.h maketime.h partime.h pch.h \ + quote.h quotearg.h quotesys.h \ + unlocked-io.h util.h version.h xalloc.h +MISC = AUTHORS COPYING ChangeLog INSTALL Makefile.in NEWS README \ + aclocal.m4 \ + config.hin configure configure.ac \ + install-sh mkinstalldirs patch.man stdbool.h.in DISTFILES = $(MISC) $(SRCS) $(HDRS) +DISTFILES_M4 = $(ACINCLUDE_INPUTS) DISTFILES_PC = pc/chdirsaf.c DISTFILES_PC_DJGPP = pc/djgpp/README pc/djgpp/config.sed \ pc/djgpp/configure.bat pc/djgpp/configure.sed patch_name = `echo patch | sed '$(transform)'` -all:: patch +all:: patch$(EXEEXT) info:: check:: @@ -82,14 +105,14 @@ installcheck:: COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) -Ded_PROGRAM=\"$(ed_PROGRAM)\" \ -I. -I$(srcdir) $(CFLAGS) -.c.o: +.c.$(OBJEXT): $(COMPILE) $< -patch: $(OBJS) +patch$(EXEEXT): $(OBJS) $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) install:: all installdirs - $(INSTALL_PROGRAM) patch $(bindir)/$(patch_name) + $(INSTALL_PROGRAM) patch$(EXEEXT) $(bindir)/$(patch_name)$(EXEEXT) -$(INSTALL_DATA) $(srcdir)/patch.man $(man1dir)/$(patch_name)$(man1ext) installdirs:: @@ -99,31 +122,59 @@ install-strip:: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install uninstall:: - rm -f $(bindir)/$(patch_name) $(man1dir)/$(patch_name)$(man1ext) + rm -f $(bindir)/$(patch_name)$(EXEEXT) + rm -f $(man1dir)/$(patch_name)$(man1ext) Makefile: Makefile.in $(CONFIG_STATUS) $(SHELL) $(CONFIG_STATUS) config.status: configure $(SHELL) $(CONFIG_STATUS) --recheck -configure: configure.in +configure: configure.ac $(srcdir)/aclocal.m4 cd $(srcdir) && autoconf -config.hin: configure.in acconfig.h +config.hin: configure.ac $(srcdir)/aclocal.m4 cd $(srcdir) && rm -f config.hin && autoheader +stdbool.h: stdbool.h.in + sed -e 's/@''HAVE__BOOL''@/@HAVE__BOOL@/g' \ + <$(srcdir)/stdbool.h.in >stdbool.h + +M4DIR = $(srcdir)/m4 +ACINCLUDE_INPUTS = \ + $(M4DIR)/backupfile.m4 \ + $(M4DIR)/d-ino.m4 \ + $(M4DIR)/dirname.m4 \ + $(M4DIR)/dos.m4 \ + $(M4DIR)/error.m4 \ + $(M4DIR)/getopt.m4 \ + $(M4DIR)/malloc.m4 \ + $(M4DIR)/mbrtowc.m4 \ + $(M4DIR)/mbstate_t.m4 \ + $(M4DIR)/memchr.m4 \ + $(M4DIR)/mkdir.m4 \ + $(M4DIR)/onceonly.m4 \ + $(M4DIR)/quote.m4 \ + $(M4DIR)/quotearg.m4 \ + $(M4DIR)/realloc.m4 \ + $(M4DIR)/rmdir.m4 \ + $(M4DIR)/setmode.m4 \ + $(M4DIR)/stdbool.m4 \ + $(M4DIR)/unlocked-io.m4 \ + $(M4DIR)/utimbuf.m4 \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-vendor@FreeBSD.ORG Sat Jul 27 20:15:19 2013 Return-Path: <owner-svn-src-vendor@FreeBSD.ORG> Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 70E73AD5; Sat, 27 Jul 2013 20:15:19 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 446D0233B; Sat, 27 Jul 2013 20:15:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6RKFJHd014262; Sat, 27 Jul 2013 20:15:19 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6RKFJ2u014261; Sat, 27 Jul 2013 20:15:19 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201307272015.r6RKFJ2u014261@svn.freebsd.org> From: "Pedro F. Giffuni" <pfg@FreeBSD.org> Date: Sat, 27 Jul 2013 20:15:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r253718 - vendor/patch/2.5.9 X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree <svn-src-vendor.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>, <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor> List-Post: <mailto:svn-src-vendor@freebsd.org> List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>, <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 27 Jul 2013 20:15:19 -0000 Author: pfg Date: Sat Jul 27 20:15:18 2013 New Revision: 253718 URL: http://svnweb.freebsd.org/changeset/base/253718 Log: Tag vendor/patch with 2.5.9: GNU patch released on 2003-05-20. Added: vendor/patch/2.5.9/ - copied from r253717, vendor/patch/dist/