From owner-cvs-src@FreeBSD.ORG Thu Jul 10 02:17:44 2008 Return-Path: Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ABF671065684; Thu, 10 Jul 2008 02:17:44 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 89EC18FC16; Thu, 10 Jul 2008 02:17:44 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m6A2Hi9V017539; Thu, 10 Jul 2008 02:17:44 GMT (envelope-from peter@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6A2HiaP017538; Thu, 10 Jul 2008 02:17:44 GMT (envelope-from peter@repoman.freebsd.org) Message-Id: <200807100217.m6A2HiaP017538@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to peter@repoman.freebsd.org using -f From: Peter Wemm Date: Thu, 10 Jul 2008 02:08:00 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/contrib/cpio ABOUT-NLS COPYING ChangeLog INSTALL NEWS THANKS TODO src/contrib/cpio/doc cpio.texi version.texi src/contrib/cpio/lib alloca_.h argp-ba.c argp-eexst.c argp-fmtstream.c argp-fmtstream.h argp-fs-xinl.c argp-help.c ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jul 2008 02:17:44 -0000 peter 2008-07-10 02:08:00 UTC FreeBSD src repository Modified files: contrib/cpio ABOUT-NLS COPYING ChangeLog INSTALL NEWS THANKS TODO contrib/cpio/doc cpio.texi contrib/cpio/lib alloca_.h argp-ba.c argp-eexst.c argp-fmtstream.c argp-fmtstream.h argp-fs-xinl.c argp-help.c argp-namefrob.h argp-parse.c argp-pv.c argp-pvh.c argp-xinl.c argp.h basename.c dirname.c dirname.h error.c error.h exitfail.c exitfail.h full-write.c full-write.h getopt.c getopt1.c getopt_.h getopt_int.h gettext.h mempcpy.c rmt.h rtapelib.c safe-read.c safe-read.h safe-write.c safe-write.h savedir.c savedir.h strchrnul.c stripslash.c strndup.c strnlen.c system.h unlocked-io.h xalloc-die.c xalloc.h xmalloc.c contrib/cpio/src copyin.c copyout.c copypass.c cpio.h cpiohdr.h defer.c defer.h dstring.c dstring.h extern.h filemode.c filetypes.h global.c idcache.c main.c makepath.c tar.c tar.h tarhdr.h userspec.c util.c gnu/usr.bin/cpio Makefile config.h Added files: contrib/cpio/doc version.texi contrib/cpio/lib argp-pin.c fatal.c hash.c hash.h intprops.h inttostr.c inttostr.h paxerror.c paxexit.c paxlib.h paxnames.c quote.c quote.h quotearg.c quotearg.h rmt-command.h system-ioctl.h umaxtostr.c utimens.c utimens.h xstrndup.c xstrndup.h Removed files: contrib/cpio/lib exit.h localedir.h mempcpy.h strcase.h strchrnul.h strndup.h Log: SVN rev 180407 on 2008-07-10 02:08:00Z by peter Merge gnu cpio 2.6 -> 2.8 changes. Unfortunately, we have massive conflicts due to radically different approaches to security and bug fixes. In some cases I re-started from the vendor version and reimplemented our patches. Fortunately, this is not enabled by default in -current. Revision Changes Path 1.2 +925 -529 src/contrib/cpio/ABOUT-NLS 1.2 +6 -5 src/contrib/cpio/COPYING 1.2 +815 -2 src/contrib/cpio/ChangeLog 1.2 +34 -31 src/contrib/cpio/INSTALL 1.2 +91 -0 src/contrib/cpio/NEWS 1.2 +7 -1 src/contrib/cpio/THANKS 1.2 +80 -277 src/contrib/cpio/TODO 1.3 +181 -142 src/contrib/cpio/doc/cpio.texi 1.1 +4 -0 src/contrib/cpio/doc/version.texi (new) 1.2 +20 -20 src/contrib/cpio/lib/alloca_.h 1.2 +1 -1 src/contrib/cpio/lib/argp-ba.c 1.2 +2 -2 src/contrib/cpio/lib/argp-eexst.c 1.2 +23 -28 src/contrib/cpio/lib/argp-fmtstream.c 1.2 +10 -18 src/contrib/cpio/lib/argp-fmtstream.h 1.2 +2 -2 src/contrib/cpio/lib/argp-fs-xinl.c 1.2 +189 -119 src/contrib/cpio/lib/argp-help.c 1.2 +11 -9 src/contrib/cpio/lib/argp-namefrob.h 1.2 +55 -28 src/contrib/cpio/lib/argp-parse.c 1.1 +28 -0 src/contrib/cpio/lib/argp-pin.c (new) 1.2 +3 -3 src/contrib/cpio/lib/argp-pv.c 1.2 +2 -2 src/contrib/cpio/lib/argp-pvh.c 1.2 +2 -2 src/contrib/cpio/lib/argp-xinl.c 1.3 +71 -53 src/contrib/cpio/lib/argp.h 1.2 +81 -31 src/contrib/cpio/lib/basename.c 1.2 +51 -87 src/contrib/cpio/lib/dirname.c 1.2 +32 -9 src/contrib/cpio/lib/dirname.h 1.2 +85 -53 src/contrib/cpio/lib/error.c 1.2 +3 -3 src/contrib/cpio/lib/error.h 1.2 +0 -32 src/contrib/cpio/lib/exit.h (dead) 1.2 +5 -6 src/contrib/cpio/lib/exitfail.c 1.2 +1 -1 src/contrib/cpio/lib/exitfail.h 1.1 +27 -0 src/contrib/cpio/lib/fatal.c (new) 1.2 +4 -6 src/contrib/cpio/lib/full-write.c 1.2 +1 -1 src/contrib/cpio/lib/full-write.h 1.2 +19 -69 src/contrib/cpio/lib/getopt.c 1.2 +3 -6 src/contrib/cpio/lib/getopt1.c 1.2 +11 -12 src/contrib/cpio/lib/getopt_.h 1.2 +1 -1 src/contrib/cpio/lib/getopt_int.h 1.2 +211 -9 src/contrib/cpio/lib/gettext.h 1.1 +1048 -0 src/contrib/cpio/lib/hash.c (new) 1.1 +88 -0 src/contrib/cpio/lib/hash.h (new) 1.1 +78 -0 src/contrib/cpio/lib/intprops.h (new) 1.1 +51 -0 src/contrib/cpio/lib/inttostr.c (new) 1.1 +30 -0 src/contrib/cpio/lib/inttostr.h (new) 1.2 +0 -4 src/contrib/cpio/lib/localedir.h (dead) 1.2 +4 -4 src/contrib/cpio/lib/mempcpy.c 1.2 +0 -36 src/contrib/cpio/lib/mempcpy.h (dead) 1.1 +365 -0 src/contrib/cpio/lib/paxerror.c (new) 1.1 +28 -0 src/contrib/cpio/lib/paxexit.c (new) 1.1 +115 -0 src/contrib/cpio/lib/paxlib.h (new) 1.1 +156 -0 src/contrib/cpio/lib/paxnames.c (new) 1.1 +41 -0 src/contrib/cpio/lib/quote.c (new) 1.1 +22 -0 src/contrib/cpio/lib/quote.h (new) 1.1 +697 -0 src/contrib/cpio/lib/quotearg.c (new) 1.1 +140 -0 src/contrib/cpio/lib/quotearg.h (new) 1.1 +4 -0 src/contrib/cpio/lib/rmt-command.h (new) 1.2 +1 -1 src/contrib/cpio/lib/rmt.h 1.2 +7 -7 src/contrib/cpio/lib/rtapelib.c 1.2 +5 -9 src/contrib/cpio/lib/safe-read.c 1.2 +12 -2 src/contrib/cpio/lib/safe-read.h 1.2 +1 -1 src/contrib/cpio/lib/safe-write.c 1.2 +1 -1 src/contrib/cpio/lib/safe-write.h 1.2 +55 -41 src/contrib/cpio/lib/savedir.c 1.2 +4 -3 src/contrib/cpio/lib/savedir.h 1.2 +0 -47 src/contrib/cpio/lib/strcase.h (dead) 1.2 +5 -3 src/contrib/cpio/lib/strchrnul.c 1.2 +0 -28 src/contrib/cpio/lib/strchrnul.h (dead) 1.2 +21 -15 src/contrib/cpio/lib/stripslash.c 1.2 +7 -25 src/contrib/cpio/lib/strndup.c 1.2 +0 -30 src/contrib/cpio/lib/strndup.h (dead) 1.2 +8 -25 src/contrib/cpio/lib/strnlen.c 1.1 +55 -0 src/contrib/cpio/lib/system-ioctl.h (new) 1.2 +25 -74 src/contrib/cpio/lib/system.h 1.1 +3 -0 src/contrib/cpio/lib/umaxtostr.c (new) 1.2 +99 -99 src/contrib/cpio/lib/unlocked-io.h 1.1 +189 -0 src/contrib/cpio/lib/utimens.c (new) 1.1 +3 -0 src/contrib/cpio/lib/utimens.h (new) 1.2 +3 -6 src/contrib/cpio/lib/xalloc-die.c 1.2 +197 -5 src/contrib/cpio/lib/xalloc.h 1.2 +28 -134 src/contrib/cpio/lib/xmalloc.c 1.1 +37 -0 src/contrib/cpio/lib/xstrndup.c (new) 1.1 +24 -0 src/contrib/cpio/lib/xstrndup.h (new) 1.5 +216 -230 src/contrib/cpio/src/copyin.c 1.4 +391 -339 src/contrib/cpio/src/copyout.c 1.5 +58 -97 src/contrib/cpio/src/copypass.c 1.2 +7 -4 src/contrib/cpio/src/cpio.h 1.2 +50 -34 src/contrib/cpio/src/cpiohdr.h 1.2 +6 -5 src/contrib/cpio/src/defer.c 1.2 +8 -7 src/contrib/cpio/src/defer.h 1.2 +6 -10 src/contrib/cpio/src/dstring.c 1.2 +4 -3 src/contrib/cpio/src/dstring.h 1.3 +88 -67 src/contrib/cpio/src/extern.h 1.2 +4 -3 src/contrib/cpio/src/filemode.c 1.2 +4 -3 src/contrib/cpio/src/filetypes.h 1.3 +6 -8 src/contrib/cpio/src/global.c 1.2 +4 -3 src/contrib/cpio/src/idcache.c 1.4 +162 -130 src/contrib/cpio/src/main.c 1.2 +19 -53 src/contrib/cpio/src/makepath.c 1.3 +21 -42 src/contrib/cpio/src/tar.c 1.2 +4 -4 src/contrib/cpio/src/tar.h 1.2 +4 -3 src/contrib/cpio/src/tarhdr.h 1.3 +11 -9 src/contrib/cpio/src/userspec.c 1.3 +267 -172 src/contrib/cpio/src/util.c 1.15 +13 -2 src/gnu/usr.bin/cpio/Makefile 1.2 +573 -47 src/gnu/usr.bin/cpio/config.h