diff -Nru afio-2.5.1.20130626+gite266635/afio.1 afio-2.5.1.20160103+gitc8e4317/afio.1 --- afio-2.5.1.20130626+gite266635/afio.1 2013-06-26 19:24:30.000000000 +0000 +++ afio-2.5.1.20160103+gitc8e4317/afio.1 2016-01-03 16:53:53.000000000 +0000 @@ -1281,7 +1281,7 @@ .PP To distinguish between different uses, the .I label -of a control file should indicate the program that made the contol +of a control file should indicate the program that made the control file and the purpose of the control file data. It should have the form .PP @@ -1360,7 +1360,7 @@ .I afio will issue a warning message. .PP -If a contol file is encountered and no +If a control file is encountered and no .B \-D option is given, .I afio diff -Nru afio-2.5.1.20130626+gite266635/compfile.c afio-2.5.1.20160103+gitc8e4317/compfile.c --- afio-2.5.1.20130626+gite266635/compfile.c 2013-06-26 19:24:30.000000000 +0000 +++ afio-2.5.1.20160103+gitc8e4317/compfile.c 2016-01-03 16:53:53.000000000 +0000 @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -298,11 +299,15 @@ tmpcomp++; else tmpcomp = name; +#ifdef NAME_MAX + if (strlen (tmpcomp) + 2 > NAME_MAX) +#else #ifdef MAXNAMLEN /* BSD otherwise should be sysV (FFS on sysV?) */ if (strlen (tmpcomp) + 2 > MAXNAMLEN) #else if (strlen (tmpcomp) + 2 > DIRSIZ) -#endif +#endif /* MAXNAMLEN */ +#endif /* NAME_MAX */ { #ifndef LONGZFILE VOID warn (name, " is too long to tack on .z"); diff -Nru afio-2.5.1.20130626+gite266635/debian/changelog afio-2.5.1.20160103+gitc8e4317/debian/changelog --- afio-2.5.1.20130626+gite266635/debian/changelog 2013-06-27 11:02:23.000000000 +0000 +++ afio-2.5.1.20160103+gitc8e4317/debian/changelog 2016-10-21 07:20:48.000000000 +0000 @@ -1,3 +1,20 @@ +afio (2.5.1.20160103+gitc8e4317-1) unstable; urgency=medium + + * New upstream snapshot release. + * debian/compat + - Update to 9. + * debian/control + - (Homepage): Update. + - (Standards-Version): Update to 3.9.8. + - (Vcs-*): Update to anonscm.debian.org. + * debian/copyright + - (Files: *): Add Copyright years. + - Update URLs. + * debian/patches + - (10, 20): Correct spelling. Forwarded upstream. + + -- Jari Aalto Fri, 21 Oct 2016 10:20:48 +0300 + afio (2.5.1.20130626+gite266635-1) unstable; urgency=low * New upstream release. diff -Nru afio-2.5.1.20130626+gite266635/debian/control afio-2.5.1.20160103+gitc8e4317/debian/control --- afio-2.5.1.20130626+gite266635/debian/control 2013-06-27 11:02:23.000000000 +0000 +++ afio-2.5.1.20160103+gitc8e4317/debian/control 2016-10-21 07:20:48.000000000 +0000 @@ -3,10 +3,10 @@ Priority: optional Maintainer: Jari Aalto Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.4 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/afio.git -Vcs-Git: git://anonscm.debian.org/collab-maint/afio.git -Homepage: http://freshmeat.net/projects/afio +Standards-Version: 3.9.8 +Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/afio.git +Vcs-Git: https://anonscm.debian.org/git/collab-maint/afio.git +Homepage: https://github.com/kholtman/afio Package: afio Architecture: any diff -Nru afio-2.5.1.20130626+gite266635/debian/copyright afio-2.5.1.20160103+gitc8e4317/debian/copyright --- afio-2.5.1.20130626+gite266635/debian/copyright 2013-06-27 11:02:23.000000000 +0000 +++ afio-2.5.1.20160103+gitc8e4317/debian/copyright 2016-10-21 07:20:48.000000000 +0000 @@ -1,23 +1,29 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: afio Upstream-Contact: Koen Holtman -Source: http://freshmeat.net/projects/afio -X-Upstream-Vcs: https://github.com/kholtman/afio +Source: https://github.com/kholtman/afio +X-Upstream-Vcs: git clone https://github.com/kholtman/afio.git X-Upstream-Bugs: https://github.com/kholtman/afio/issues Files: * Copyright: - Koen Holtman , , (the current maintainer) - Mark Brukhartz <..!ihnp4!laidbak!mdb> + 1995-2016 Koen Holtman , , (the current maintainer) + 1994 Anders Baekgaard + 1993-1994 Dave Gymer + 1993 Andrew Stevens + 1985 Mark Brukhartz <..!ihnp4!laidbak!mdb> Jeff Buhrt - Dave Gymer - Andrew Stevens - Anders Baekgaard +Comment: + Original author of the program is Mark Brukhartz. + Current maintainer is Koen Holtman. + For years, see patchlevel.h and HISTORY file. + Jeff Buhrt is mentioned briefly in afio.c and afio.1 but + no year information. License: Custom Files: debian/* Copyright: - 2012, 2013 Jari Aalto + 2012-2016 Jari Aalto 2005-2007, 2011 Erik Schanze , 1997-2004 Dirk Eddelbuettel License: GPL-2+ diff -Nru afio-2.5.1.20130626+gite266635/debian/patches/10-manpage.patch afio-2.5.1.20160103+gitc8e4317/debian/patches/10-manpage.patch --- afio-2.5.1.20130626+gite266635/debian/patches/10-manpage.patch 1970-01-01 00:00:00.000000000 +0000 +++ afio-2.5.1.20160103+gitc8e4317/debian/patches/10-manpage.patch 2016-10-21 07:20:48.000000000 +0000 @@ -0,0 +1,85 @@ +From: Jari Aalto +Subject: Correct spelling +Forwarded: https://github.com/kholtman/afio/pull/8 + +--- + afio.1 | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +--- a/afio.1 ++++ b/afio.1 +@@ -541,7 +541,7 @@ option. + .TP + .BI "\-H " promptscript + Specify a script to run, in stead of using the normal prompt, before +-advancing to the next achive volume. The script will be run with the ++advancing to the next archive volume. The script will be run with the + volume number, archive specification, and the reason for changing to + the next volume as arguments. The script + should exit with 0 for OK and 1 for abort, other exit codes will be +@@ -965,7 +965,7 @@ be used to avoid + .IR afio (1) + reporting an error. Use the special case + .B "\-3 0" +-to supress the error message without rewinding any file descriptor. ++to suppress the error message without rewinding any file descriptor. + The + .B "\-3 0" + option may also be needed to successfully read back encrypted archives +@@ -975,7 +975,7 @@ version 2.4.5 and older. + .TP + .B \-4 + (Deprecated, the intended effect of this option is now +-achieved by default as long as the ++archived by default as long as the + .B \-5 + option is not used. This option could still be useful for compatibility + with machines running an older version of +@@ -1049,7 +1049,7 @@ can be used to archive files all files u + .IR /tmp/a[12]*4 . + A second use of + .B \-7 +-toggles the matching for subsequently occuring ++toggles the matching for subsequently occurring + .BR \-y ", " \-Y ", " \-w ", and " \-W + back to shell wildcard pattern matching. + .TP +@@ -1171,11 +1171,11 @@ option is used. + The contents of hard linked files are (unless the + .B \-l + option is used) only stored once in the archive. +-The file headers for the second, third, and later occurence of a hard ++The file headers for the second, third, and later occurrence of a hard + linked file have no data after them. This makes selective + restores of hard-liked files difficult: +-if later occurences are to be restored correctly, +-the first occurence always needs to be selected too. ++if later occurrences are to be restored correctly, ++the first occurrence always needs to be selected too. + .PP + .SH NOTES + Special-case archive names: +@@ -1554,7 +1554,7 @@ the use of the + option forces the writing of file content with each hard linked file, + rather than only once for every set of hard linked files. + .PP +-When it is run without super-user priviliges, ++When it is run without super-user privileges, + .I afio + is not able to unpack a file into a directory for which it has no write + permissions, even if it just created that directory itself. This can be a +@@ -1578,12 +1578,12 @@ Create an archive with compressed files: + .PP + Install (unpack) an archive with compressed files: + .br +-.I "afio \-i \-v \-Z achive" ++.I "afio \-i \-v \-Z archive" + .PP + Install (unpack) an archive with compressed files, protecting newer existing + files: + .br +-.I "afio \-i \-v \-Z \-n achive" ++.I "afio \-i \-v \-Z \-n archive" + .PP + Create an archive with compressed files on floppy disks: + .br diff -Nru afio-2.5.1.20130626+gite266635/debian/patches/20-bin-spelling.patch afio-2.5.1.20160103+gitc8e4317/debian/patches/20-bin-spelling.patch --- afio-2.5.1.20130626+gite266635/debian/patches/20-bin-spelling.patch 1970-01-01 00:00:00.000000000 +0000 +++ afio-2.5.1.20160103+gitc8e4317/debian/patches/20-bin-spelling.patch 2016-10-21 07:20:48.000000000 +0000 @@ -0,0 +1,28 @@ +From: Jari Aalto +Subject: Correct spelling +Forwarded: https://github.com/kholtman/afio/pull/9 +- +--- + afio.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/afio.c ++++ b/afio.c +@@ -2643,7 +2643,7 @@ next (mode, why) + else + { + while (Fflag && strcmp(answer,"f") == 0) { +- fprintf (stderr, "formating using %s ...\n",formatcmd); ++ fprintf (stderr, "formatting using %s ...\n",formatcmd); + if (system (formatcmd) != 0) + { + strcpy(msg,"\n"); +@@ -5157,7 +5157,7 @@ verify (error) + } + } + else if (strcmp (answer, "quit") == 0) +- fatal (arspec, "Quiting during a verify"); ++ fatal (arspec, "Quitting during a verify"); + } + } + } diff -Nru afio-2.5.1.20130626+gite266635/debian/patches/series afio-2.5.1.20160103+gitc8e4317/debian/patches/series --- afio-2.5.1.20130626+gite266635/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ afio-2.5.1.20160103+gitc8e4317/debian/patches/series 2016-10-21 07:20:48.000000000 +0000 @@ -0,0 +1,2 @@ +10-manpage.patch +20-bin-spelling.patch diff -Nru afio-2.5.1.20130626+gite266635/HISTORY afio-2.5.1.20160103+gitc8e4317/HISTORY --- afio-2.5.1.20130626+gite266635/HISTORY 2013-06-26 19:24:30.000000000 +0000 +++ afio-2.5.1.20160103+gitc8e4317/HISTORY 2016-01-03 16:53:53.000000000 +0000 @@ -1001,3 +1001,10 @@ error (except for hard linked files). Based on problem report by Christian Schneider. Also updated -r description in manpage. Closes Debian bug #565202. + +Fixed typos in manual file (contol->control). Contributed by +bfontaine on github. + +Added support in compfile.c for musl libc (http://musl-libc.org) which +does not have MAXNAMLEN nor DIRSIZ. Based on patch by doughdemon on +github.