afio: Update to 2.5.2

Changelog:
Not available.

5 files changed, 50 insertions, 52 deletions

diff --git a/archivers/afio/Makefile b/archivers/afio/Makefile
index 5b580d5aa68..ce9c669f1dd 100644
--- a/archivers/afio/Makefile
+++ b/archivers/afio/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2016/02/26 11:40:29 jperkin Exp $
+# $NetBSD: Makefile,v 1.19 2020/11/25 14:59:24 ryoon Exp $
 
-DISTNAME=	afio-2.5.1
+DISTNAME=	afio-2.5.2
 CATEGORIES=	archivers
-MASTER_SITES=	http://members.chello.nl/~k.holtman/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${MASTER_SITE_GITHUB:=kholtman/}
+GITHUB_PROJECT=	afio
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://members.chello.nl/~k.holtman/afio.html
diff --git a/archivers/afio/distinfo b/archivers/afio/distinfo
index f0043ad0658..6b7a1e88f9a 100644
--- a/archivers/afio/distinfo
+++ b/archivers/afio/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 00:56:20 agc Exp $
+$NetBSD: distinfo,v 1.10 2020/11/25 14:59:24 ryoon Exp $
 
-SHA1 (afio-2.5.1.tgz) = bff6b9a147dc5b0e6bd7f1a76f0b84e4dd9a7dc9
-RMD160 (afio-2.5.1.tgz) = 923981a9e6766781705ceedecd3d86afa5b9abae
-SHA512 (afio-2.5.1.tgz) = afa4e01cc9e7da5bff7c96d2da9a41c296e7b89c50484f58a8b011173a99a144a9e77d3ee8136622e490287b99a7ae76c6eba901a2186b5a3a6bab164a37c864
-Size (afio-2.5.1.tgz) = 191765 bytes
-SHA1 (patch-aa) = e35b47c2f10a6f80d8446e4c22a7a023dae55933
-SHA1 (patch-ab) = a93cf92b80f2b40e30987822b144c24f3a3e5c1e
-SHA1 (patch-ac) = d589b2e37d8a81373f14e4093fe8cc2b30b5489b
+SHA1 (afio-2.5.2.tar.gz) = f811295db1381212fa54f583840982f28b64eac2
+RMD160 (afio-2.5.2.tar.gz) = a0da5fafb6cee3fac054bbbb74eacc8e24cd7c7f
+SHA512 (afio-2.5.2.tar.gz) = e0fb9b2d31bb912d7f30d8dd992cffcc99a84424c7386082abb8da82a1911b852c5a80e8135f0b6266113519f582dba45dc3c87c8f3b822a2daa14a1ae1d9944
+Size (afio-2.5.2.tar.gz) = 194030 bytes
+SHA1 (patch-aa) = e7f79bd551a733d59fd3902bbadaccac28a1de79
+SHA1 (patch-ab) = e1f8e5b489f844c85d9024d713f07e223b106db3
+SHA1 (patch-ac) = 0ba88c3f22b51b0f9cb8de1ca709d6bf566169a3
diff --git a/archivers/afio/patches/patch-aa b/archivers/afio/patches/patch-aa
index f3ad906feed..535f6a26061 100644
--- a/archivers/afio/patches/patch-aa
+++ b/archivers/afio/patches/patch-aa
@@ -1,33 +1,30 @@
-$NetBSD: patch-aa,v 1.2 2004/04/11 23:04:50 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2020/11/25 14:59:24 ryoon Exp $
 
---- Makefile.orig	2003-12-21 04:23:51.000000000 -0600
+--- Makefile.orig	2018-11-30 14:25:04.000000000 +0000
 +++ Makefile
 @@ -28,7 +28,7 @@ SHELL=/bin/sh
  c	= -DHAVEMEMCMP
  ##  Define DEFFMTCMD to being how to format the media you use the most
- ##		This is the DEFault FoRMat CoManD. 
+ ##		This is the DEFault FoRMat CoManD.
 -d	= -DDEFFMTCMD='"fdformat /dev/fd0H1440"'
-+d	= -DDEFFMTCMD='"cdrecord dev=/dev/rcd0d -v -force blank=all"' # or '"fdformat /dev/fd0a"'
++d	= -DDEFFMTCMD='"cdrecord dev=/dev/rcd0d -v -force blank=all"'
  ##  Define LONGZFILE if you want .Z to be tagged on the end of a 14 char
  ##	file name (or longer for BSD) in the archive when the file is compressed
  #e	= -DLONGZFILE
-@@ -71,11 +71,12 @@ LARGEFILEFLAGS=-D_FILE_OFFSET_BITS=64 -D
- MW=
+@@ -74,9 +74,10 @@ MW=-Wformat -Werror=format-security -Wal
+ #code can be reviewed manually
  #MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations
  
--CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW}
-+#CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW}
+-CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer -Wno-unused-result $(LARGEFILEFLAGS) $(MW)
++#CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer -Wno-unused-result $(LARGEFILEFLAGS) $(MW)
 +CFLAGS1 = ${LARGEFILEFLAGS}
  
 -CC=gcc
 +#CC=gcc
  
--CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I
-+CFLAGS += ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I
- LDFLAGS =
- 
- afio : afio.o compfile.o exten.o match.o $M
-@@ -88,8 +89,8 @@ clean:
+ # also using contents of usin CPPFLAGS, CFLAGS, LDFLAGS out of environment
+ # variables, if they exist
+@@ -95,8 +96,8 @@ clean:
  	cd regtest; /bin/sh regtest.clean
  
  install: afio
diff --git a/archivers/afio/patches/patch-ab b/archivers/afio/patches/patch-ab
index e0bccafbb79..27d06b0ba25 100644
--- a/archivers/afio/patches/patch-ab
+++ b/archivers/afio/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.4 2015/02/15 14:45:48 ryoon Exp $
+$NetBSD: patch-ab,v 1.5 2020/11/25 14:59:24 ryoon Exp $
 
 - Use NAME_MAX if available rather than relying on MAXNAMLEN.
 - Fix Solaris preprocessor symbols.
 - Fix bad calls to execlp() that break on 64-bit platforms.
 
---- compfile.c.orig	2012-02-05 13:45:01.000000000 +0000
+--- compfile.c.orig	2018-11-30 14:25:04.000000000 +0000
 +++ compfile.c
 @@ -2,6 +2,7 @@
  
@@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.4 2015/02/15 14:45:48 ryoon Exp $
  #include <unistd.h>
  #include <string.h>
  
-@@ -211,7 +212,7 @@ void waitforgzip()
+@@ -224,7 +225,7 @@ void waitforgzip()
   * version;
   */
  
@@ -23,10 +23,10 @@ $NetBSD: patch-ab,v 1.4 2015/02/15 14:45:48 ryoon Exp $
  #include <dirent.h>
  #else
  #include <sys/dir.h>
-@@ -284,7 +285,9 @@ compressfile (int *fdp, char *name, reg 
-       tmpcomp++;
-     else
-       tmpcomp = name;
+@@ -299,7 +300,9 @@ compressfile (int *fdp, char *name, reg 
+ #ifdef NAME_MAX
+     if (strlen (tmpcomp) + 2 > NAME_MAX)
+ #else
 -#ifdef MAXNAMLEN	   /* BSD otherwise should be sysV (FFS on sysV?) */
 +#if defined(NAME_MAX)
 +    if (strlen (tmpcomp) + 2 > NAME_MAX)
diff --git a/archivers/afio/patches/patch-ac b/archivers/afio/patches/patch-ac
index 81b32a7e47b..7b225f7328b 100644
--- a/archivers/afio/patches/patch-ac
+++ b/archivers/afio/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2015/02/15 14:45:48 ryoon Exp $
+$NetBSD: patch-ac,v 1.4 2020/11/25 14:59:24 ryoon Exp $
 
 - Use standard headers.
 - Use strerror, not sys_errlist and sys_nerr.
@@ -8,9 +8,9 @@ $NetBSD: patch-ac,v 1.3 2015/02/15 14:45:48 ryoon Exp $
 - Build fix for makedev() on Solaris and Interix.
 - Fix bad calls to execlp() that break on 64-bit platforms.
 
---- afio.c.orig	2012-02-05 13:25:57.000000000 +0000
+--- afio.c.orig	2018-11-30 14:25:04.000000000 +0000
 +++ afio.c
-@@ -166,7 +166,7 @@ static char *ident = "$Header: /u/buhrt/
+@@ -163,7 +163,7 @@
  #include <stdio.h>
  #include <errno.h>
  
@@ -19,7 +19,7 @@ $NetBSD: patch-ac,v 1.3 2015/02/15 14:45:48 ryoon Exp $
  #include <sys/types.h>
  #include <utime.h>
  #include <signal.h>
-@@ -202,30 +202,29 @@ extern char *sys_errlist[];
+@@ -199,30 +199,29 @@ extern char *sys_errlist[];
  #include <sys/types.h>
  #include <sys/ioctl.h>
  #include <sys/stat.h>
@@ -56,7 +56,7 @@ $NetBSD: patch-ac,v 1.3 2015/02/15 14:45:48 ryoon Exp $
  #else
  #include <sys/sysmacros.h>
  #endif
-@@ -1140,7 +1139,7 @@ savedirstamp (char *name, time_t mtime)
+@@ -1187,7 +1186,7 @@ savedirstamp (char *name, time_t mtime)
  STATIC void
  restoredirstamps (void)
  {
@@ -65,16 +65,16 @@ $NetBSD: patch-ac,v 1.3 2015/02/15 14:45:48 ryoon Exp $
    auto struct utimbuf tstamp;
  #else
    auto time_t tstamp[2];
-@@ -1148,7 +1147,7 @@ restoredirstamps (void)
+@@ -1196,7 +1195,7 @@ restoredirstamps (void)
    Dir *DirP_forw;
-   while(DirP!=NULL)
+   while(DirP_curr!=NULL)
    {
 -#ifdef linux_tstamp
 +#ifndef broken_utime
-     tstamp.actime = DirP->d_mtime;
-     tstamp.modtime = DirP->d_mtime;
+     tstamp.actime = DirP_curr->d_mtime;
+     tstamp.modtime = DirP_curr->d_mtime;
      /* no error code checking on purpose */
-@@ -1239,7 +1238,7 @@ readcheck (av)
+@@ -1287,7 +1286,7 @@ readcheck (av)
    auto char name[PATHSIZE];
    auto char local[PATHSIZE];
    int sel, res;
@@ -83,7 +83,7 @@ $NetBSD: patch-ac,v 1.3 2015/02/15 14:45:48 ryoon Exp $
    auto struct utimbuf tstamp;
  #else
    auto time_t tstamp[2];
-@@ -1267,7 +1266,7 @@ readcheck (av)
+@@ -1315,7 +1314,7 @@ readcheck (av)
        if(aflag && atime_sb_valid && ((sb.sb_mode & S_IFMT)==S_IFREG))
        {
  	  /* reset access time, this distroys the ctime btw. */
@@ -92,7 +92,7 @@ $NetBSD: patch-ac,v 1.3 2015/02/15 14:45:48 ryoon Exp $
  	  tstamp.actime = atime_sb.sb_atime;
  	  tstamp.modtime = atime_sb.sb_mtime;
  	  VOID utime (name, &tstamp);
-@@ -1758,7 +1757,7 @@ inentry (name, asb)
+@@ -1807,7 +1806,7 @@ inentry (name, asb)
    reg Link *linkp;
    reg int ifd;
    reg int ofd;
@@ -101,7 +101,7 @@ $NetBSD: patch-ac,v 1.3 2015/02/15 14:45:48 ryoon Exp $
    auto struct utimbuf tstamp;
  #else
    auto time_t tstamp[2];
-@@ -1794,7 +1793,7 @@ inentry (name, asb)
+@@ -1843,7 +1842,7 @@ inentry (name, asb)
    /* Cannot set utime on symlink (at least not under Linux) */
    if((asb->sb_mode & S_IFMT) != S_IFLNK)
    {
@@ -110,7 +110,7 @@ $NetBSD: patch-ac,v 1.3 2015/02/15 14:45:48 ryoon Exp $
        tstamp.actime = tstamp.modtime = mflag ? timenow : asb->sb_mtime;
        VOID utime (name, &tstamp);
  #else
-@@ -3580,7 +3579,7 @@ out (av)
+@@ -3727,7 +3726,7 @@ out (av)
      auto char name[PATHSIZE];
      auto char fsname[PATHSIZE];
      auto int compression;
@@ -119,7 +119,7 @@ $NetBSD: patch-ac,v 1.3 2015/02/15 14:45:48 ryoon Exp $
      auto struct utimbuf tstamp;
  #else
      auto time_t tstamp[2];
-@@ -3750,7 +3749,7 @@ out (av)
+@@ -3905,7 +3904,7 @@ out (av)
  	if(aflag && *fsname && ((sb.sb_mode & S_IFMT)==S_IFREG))
  	{
  	    /* reset access time, this distroys the ctime btw. */
@@ -128,7 +128,7 @@ $NetBSD: patch-ac,v 1.3 2015/02/15 14:45:48 ryoon Exp $
  	    tstamp.actime = sb.sb_atime;
  	    tstamp.modtime = sb.sb_mtime;
  	    VOID utime (fsname, &tstamp);
-@@ -4251,7 +4250,7 @@ passitem (from, asb, ifd, dir)
+@@ -4405,7 +4404,7 @@ passitem (from, asb, ifd, dir)
  {
    reg int ofd;
  
@@ -137,7 +137,7 @@ $NetBSD: patch-ac,v 1.3 2015/02/15 14:45:48 ryoon Exp $
    auto struct utimbuf tstamp;
  #else
    auto time_t tstamp[2];
-@@ -4267,7 +4266,7 @@ passitem (from, asb, ifd, dir)
+@@ -4421,7 +4420,7 @@ passitem (from, asb, ifd, dir)
  	continue;
        if (ofd > 0)
  	passdata (from, ifd, to, ofd);
@@ -146,7 +146,7 @@ $NetBSD: patch-ac,v 1.3 2015/02/15 14:45:48 ryoon Exp $
        tstamp.actime = tstamp.modtime = mflag ? timenow : asb->sb_mtime;
        VOID utime (to, &tstamp);
  #else
-@@ -4901,7 +4900,7 @@ xwait (pid, what, compstat2)
+@@ -5103,7 +5102,7 @@ xwait (pid, what, compstat2)
       char *what;
       int compstat2;
  {
@@ -155,7 +155,7 @@ $NetBSD: patch-ac,v 1.3 2015/02/15 14:45:48 ryoon Exp $
    reg Child *cp;
    reg Child **acp;
    auto char why[100];
-@@ -4918,16 +4917,16 @@ xwait (pid, what, compstat2)
+@@ -5120,16 +5119,16 @@ xwait (pid, what, compstat2)
    free ((char *) cp);
    if (status == 0)
      return (0);