diff -Nru pax-20140703/cpio.1 pax-20151013/cpio.1 --- pax-20140703/cpio.1 2014-07-03 19:36:50.000000000 +0000 +++ pax-20151013/cpio.1 2015-04-12 21:50:02.000000000 +0000 @@ -1,7 +1,7 @@ -.\" $MirOS: src/bin/pax/cpio.1,v 1.35 2014/07/03 19:36:25 tg Exp $ +.\" $MirOS: src/bin/pax/cpio.1,v 1.36 2015/04/12 21:49:37 tg Exp $ .\" $OpenBSD: cpio.1,v 1.34 2011/09/03 22:59:08 jmc Exp $ .\" -.\" Copyright (c) 2005, 2009, 2011, 2012, 2014 +.\" Copyright (c) 2005, 2009, 2011, 2012, 2014, 2015 .\" Thorsten Glaser .\" Copyright (c) 1997 SigmaSoft, Th. Lockert .\" All rights reserved. @@ -80,7 +80,7 @@ .\" with -mandoc, it might implement .Mx itself, but we want to .\" use our own definition. And .Dd must come *first*, always. .\" -.Dd $Mdocdate: July 3 2014 $ +.Dd $Mdocdate: April 12 2015 $ .\" .\" Check which macro package we use, and do other -mdoc setup. .\" @@ -225,6 +225,22 @@ .Pp The options are as follows: .Bl -tag -width Ds +.It Fl 0 +Use the NUL +.Pq Ql \e0 +character as a pathname terminator, instead of newline +.Pq Ql \en . +This applies only to the pathnames read from standard input in +the write and copy modes, +and to the pathnames written to standard output in list mode. +This option is expected to be used in concert with the +.Fl print0 +function in +.Xr find 1 +or the +.Fl 0 +flag in +.Xr xargs 1 . .It Fl o Create an archive. Reads the list of files to store in the @@ -377,22 +393,6 @@ .Ar patterns that were specified on the command line. .Bl -tag -width Ds -.It Fl 0 -Use the NUL -.Pq Ql \e0 -character as a pathname terminator, instead of newline -.Pq Ql \en . -This applies only to the pathnames read from standard input in -the write and copy modes, -and to the pathnames written to standard output in list mode. -This option is expected to be used in concert with the -.Fl print0 -function in -.Xr find 1 -or the -.Fl 0 -flag in -.Xr xargs 1 . .It Fl 6 Process old-style .Nm cpio diff -Nru pax-20140703/debian/changelog pax-20151013/debian/changelog --- pax-20140703/debian/changelog 2014-10-07 18:09:53.000000000 +0000 +++ pax-20151013/debian/changelog 2015-10-13 21:12:45.000000000 +0000 @@ -1,3 +1,16 @@ +pax (1:20151013-1) unstable; urgency=low + + * QA upload. + * New upstream version + - document more known issues + - make list output line-buffered + * Use more current debhelper compat and techniques + * No longer try link-time optimisation as it’s constantly broken + * Unbreak x32 build + * Update lintian overrides + + -- Thorsten Glaser Tue, 13 Oct 2015 23:12:39 +0200 + pax (1:20140703-2) unstable; urgency=low * QA upload. diff -Nru pax-20140703/debian/compat pax-20151013/debian/compat --- pax-20140703/debian/compat 2014-10-07 18:03:46.000000000 +0000 +++ pax-20151013/debian/compat 2015-10-13 21:03:41.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru pax-20140703/debian/control pax-20151013/debian/control --- pax-20140703/debian/control 2014-10-07 18:09:17.000000000 +0000 +++ pax-20151013/debian/control 2015-10-13 21:00:55.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian QA Group Standards-Version: 3.9.6 -Build-Depends: debhelper (>= 5) +Build-Depends: debhelper (>= 9) VCS-git: git://anonscm.debian.org/collab-maint/pax.git VCS-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/pax.git diff -Nru pax-20140703/debian/copyright pax-20151013/debian/copyright --- pax-20140703/debian/copyright 2014-07-03 21:13:11.000000000 +0000 +++ pax-20151013/debian/copyright 2015-10-13 21:00:36.000000000 +0000 @@ -2,12 +2,12 @@ Mon, 26 Nov 2012 16:43:46 +0000. It was downloaded from: -https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-20140703.cpio.gz +https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-20151013.cpio.gz Licence: - * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2011, 2012, 2013, 2014 - * Thorsten Glaser + * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2011, 2012, 2013, 2014, 2015 + * mirabilos * Copyright (c) 1996, 1997 SigmaSoft, Th. Lockert * Copyright (c) 1992 Keith Muller. * Copyright (c) 1990, 1992, 1993 diff -Nru pax-20140703/debian/patches/debian-changes pax-20151013/debian/patches/debian-changes --- pax-20140703/debian/patches/debian-changes 2014-10-07 18:19:59.000000000 +0000 +++ pax-20151013/debian/patches/debian-changes 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -Please review changes against upstream code using SCM, -see the Vcs-* tags in debian/control for its location. - ---- pax-20140703.orig/file_subs.c -+++ pax-20140703/file_subs.c -@@ -1158,7 +1158,7 @@ set_crc(ARCHD *arcn, int fd) - int i; - int res; - off_t cpcnt = 0L; -- u_long size; -+ size_t size; - u_int32_t crc = 0; - char tbuf[FILEBLK]; - struct stat sb; -@@ -1171,8 +1171,8 @@ set_crc(ARCHD *arcn, int fd) - return(0); - } - -- if ((size = (u_long)arcn->sb.st_blksize) > (u_long)sizeof(tbuf)) -- size = (u_long)sizeof(tbuf); -+ if ((size = (size_t)arcn->sb.st_blksize) > sizeof(tbuf)) -+ size = sizeof(tbuf); - - /* - * read all the bytes we think that there are in the file. If the user ---- pax-20140703.orig/tables.c -+++ pax-20140703/tables.c -@@ -379,6 +379,10 @@ chk_ftime(ARCHD *arcn) - u_int indx; - char ckname[PAXPATHLEN+1]; - -+ if (arcn->nlen > PAXPATHLEN) -+ /*XXX just skip over this file */ -+ return (-1); -+ - /* - * no info, go ahead and add to archive - */ diff -Nru pax-20140703/debian/patches/series pax-20151013/debian/patches/series --- pax-20140703/debian/patches/series 2014-10-07 18:19:59.000000000 +0000 +++ pax-20151013/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian-changes diff -Nru pax-20140703/debian/rules pax-20151013/debian/rules --- pax-20140703/debian/rules 2014-10-07 18:08:03.000000000 +0000 +++ pax-20151013/debian/rules 2015-10-13 21:11:54.000000000 +0000 @@ -1,5 +1,6 @@ #!/usr/bin/make -f +DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_OS=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS) CC?= gcc @@ -33,14 +34,11 @@ debian/.build_stamp: dh_testdir - +for opts in '-flto=jobserver' '-fwhole-program --combine' ''; do \ - set -x; \ - ${CC} ${CPPFLAGS} ${CFLAGS} $$opts ${LDFLAGS} -o pax ar.c \ - ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c \ - ftree.c gen_subs.c getoldopt.c options.c pat_rep.c pax.c \ - sel_subs.c tables.c tar.c tty_subs.c; \ - test -x pax && exit 0; \ - done; echo >&2 Compiling failed.; exit 1 + ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o pax ar.c \ + ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c \ + ftree.c gen_subs.c getoldopt.c options.c pat_rep.c pax.c \ + sel_subs.c tables.c tar.c tty_subs.c + test -x pax echo .nr g 2 | cat - cpio.1 >debian/paxcpio.1 echo .nr g 2 | cat - pax.1 >debian/pax.1 echo .nr g 2 | cat - tar.1 >debian/paxtar.1 @@ -55,23 +53,10 @@ binary-indep: build-indep binary-arch: build-arch - dh_testdir - dh_testroot - if test -x "$$(which dh_prep)"; then dh_prep; else dh_clean -k; fi - dh_installchangelogs - dh_installdocs - dh_install - dh_installman - dh_lintian - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb + dh $@ + +# avoid dh7 being "too" automagic +override_dh_auto_install: binary: binary-arch binary-indep diff -Nru pax-20140703/debian/source.lintian-overrides pax-20151013/debian/source.lintian-overrides --- pax-20140703/debian/source.lintian-overrides 2014-07-03 21:15:24.000000000 +0000 +++ pax-20151013/debian/source.lintian-overrides 2015-10-13 21:12:23.000000000 +0000 @@ -1,2 +1,5 @@ # there is only gzsig, not pgp pax source: debian-watch-may-check-gpg-signature + +# no, thanks +pax source: no-dep5-copyright diff -Nru pax-20140703/file_subs.c pax-20151013/file_subs.c --- pax-20140703/file_subs.c 2014-07-03 17:52:36.000000000 +0000 +++ pax-20151013/file_subs.c 2015-10-13 20:19:16.000000000 +0000 @@ -57,7 +57,7 @@ #include "options.h" #include "extern.h" -__RCSID("$MirOS: src/bin/pax/file_subs.c,v 1.19 2014/07/03 17:52:11 tg Exp $"); +__RCSID("$MirOS: src/bin/pax/file_subs.c,v 1.20 2015/10/13 20:18:50 tg Exp $"); #ifndef __GLIBC_PREREQ #define __GLIBC_PREREQ(maj,min) 0 @@ -1158,7 +1158,7 @@ int i; int res; off_t cpcnt = 0L; - u_long size; + size_t size; u_int32_t crc = 0; char tbuf[FILEBLK]; struct stat sb; @@ -1171,8 +1171,8 @@ return(0); } - if ((size = (u_long)arcn->sb.st_blksize) > (u_long)sizeof(tbuf)) - size = (u_long)sizeof(tbuf); + if ((size = (size_t)arcn->sb.st_blksize) > sizeof(tbuf)) + size = sizeof(tbuf); /* * read all the bytes we think that there are in the file. If the user diff -Nru pax-20140703/pax.1 pax-20151013/pax.1 --- pax-20140703/pax.1 2014-07-03 18:57:42.000000000 +0000 +++ pax-20151013/pax.1 2014-08-03 16:02:59.000000000 +0000 @@ -1,4 +1,4 @@ -.\" $MirOS: src/bin/pax/pax.1,v 1.25 2014/07/03 18:57:17 tg Exp $ +.\" $MirOS: src/bin/pax/pax.1,v 1.26 2014/08/03 16:02:34 tg Exp $ .\" $OpenBSD: pax.1,v 1.61 2010/09/19 20:55:25 jmc Exp $ .\" $NetBSD: pax.1,v 1.3 1995/03/21 09:07:37 cgd Exp $ .\" @@ -92,7 +92,7 @@ .\" with -mandoc, it might implement .Mx itself, but we want to .\" use our own definition. And .Dd must come *first*, always. .\" -.Dd $Mdocdate: July 3 2014 $ +.Dd $Mdocdate: August 3 2014 $ .\" .\" Check which macro package we use, and do other -mdoc setup. .\" @@ -1393,8 +1393,9 @@ .Sh STANDARDS The .Nm -utility is compliant with the -IEEE Std 1003.1-2008 +utility is, except for the known +.Sx BUGS +listed below, mostly compliant with the IEEE Std 1003.1 .Pq Dq Tn POSIX specification. .Pp @@ -1422,3 +1423,6 @@ The .Ar pax file format is not yet supported. +The pattern matching does not match +.Tn POSIX +completely either, nor this documentation. diff -Nru pax-20140703/pax.c pax-20151013/pax.c --- pax-20140703/pax.c 2012-06-05 18:23:21.000000000 +0000 +++ pax-20151013/pax.c 2015-10-13 20:12:07.000000000 +0000 @@ -2,8 +2,8 @@ /* $NetBSD: pax.c,v 1.5 1996/03/26 23:54:20 mrg Exp $ */ /*- - * Copyright (c) 2012 - * Thorsten Glaser + * Copyright (c) 2012, 2015 + * mirabilos * Copyright (c) 1992 Keith Muller. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -53,7 +53,7 @@ #include "pax.h" #include "extern.h" -__RCSID("$MirOS: src/bin/pax/pax.c,v 1.19 2012/06/05 18:22:57 tg Exp $"); +__RCSID("$MirOS: src/bin/pax/pax.c,v 1.20 2015/10/13 20:11:41 tg Exp $"); static int gen_init(void); static void sig_cleanup(int) __attribute__((__noreturn__)); @@ -265,6 +265,13 @@ if ((gen_init() < 0) || (tty_init() < 0)) return(exit_val); + /* make list fd independent and line-buffered */ + if (!(listf = fdopen(dup(fileno(listf)), "wb"))) { + syswarn(1, errno, "Can't open list file descriptor"); + return (exit_val); + } + setlinebuf(listf); + /* * select a primary operation mode */ diff -Nru pax-20140703/tables.c pax-20151013/tables.c --- pax-20140703/tables.c 2012-06-05 18:23:21.000000000 +0000 +++ pax-20151013/tables.c 2015-10-13 20:34:40.000000000 +0000 @@ -2,8 +2,8 @@ /* $NetBSD: tables.c,v 1.4 1995/03/21 09:07:45 cgd Exp $ */ /*- - * Copyright (c) 2005, 2012 - * Thorsten Glaser + * Copyright (c) 2005, 2012, 2015 + * mirabilos * Copyright (c) 2011 * Svante Signell * Guillem Jover @@ -53,7 +53,7 @@ #include "tables.h" #include "extern.h" -__RCSID("$MirOS: src/bin/pax/tables.c,v 1.16 2012/06/05 18:22:57 tg Exp $"); +__RCSID("$MirOS: src/bin/pax/tables.c,v 1.18 2015/10/13 20:34:14 tg Exp $"); /* * Routines for controlling the contents of all the different databases pax