archive/afio: version 2.5.2

8 files changed, 6 insertions, 346 deletions

diff --git a/archive/afio/0001-fix-incorrect-error-reporting-on-including-control-f.patch b/archive/afio/0001-fix-incorrect-error-reporting-on-including-control-f.patch
deleted file mode 100644
index 8f7fc7ed61..0000000000
--- a/archive/afio/0001-fix-incorrect-error-reporting-on-including-control-f.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From a94a0acf7efda0ffafb5d6058a2402dba5b03bd1 Mon Sep 17 00:00:00 2001
-From: Koen Holtman <koen.holtman@ieee.org>
-Date: Sun, 23 Sep 2012 15:19:03 +0200
-Subject: [PATCH 1/5] fix incorrect error reporting on including control file,
- added -1 d option
-
----
- HISTORY | 9 +++++++++
- afio.1  | 6 ++++++
- afio.c  | 8 +++-----
- 3 files changed, 18 insertions(+), 5 deletions(-)
-
-diff --git a/HISTORY b/HISTORY
-index aaf9d6a..cee3916 100644
---- a/HISTORY
-+++ b/HISTORY
-@@ -979,3 +979,12 @@ Closes Debian bug #310806.
- Changed makefile to use $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) out of
- environment variables, these are set in some compile environments.
- Based on report and patch by Jari Aalto.
-+
-+Version 2.5.1-3:
-+
-+Fixed bug (introduced in 2.5) of afio giving an error message (and
-+nonzero exit) when including a control file in an archive.  Bug
-+reported by Ian Campbell.  Closes Debian bug #686613.
-+
-+Added d letter for the -1 option.
-+
-diff --git a/afio.1 b/afio.1
-index 3c7ba5c..e188444 100644
---- a/afio.1
-+++ b/afio.1
-@@ -878,6 +878,12 @@ will suppress the printing of all warning messages asssociated with
- .IR M ultivolume
- archive handling, messages like "Output limit reached" and
- "Continuing".
-+.B d
-+is for ignoring in the exit code any warnings about changed
-+files, which will be printed when, on creating an archive, a file that
-+is being archived changes while it is being written into the archive,
-+where the changing is detected by examining the file modification time
-+stamp.
- .B r
- is for ignoring certain warnings during the verify (\-r) operation.
- If this letter is used, some verification errors that are
-diff --git a/afio.c b/afio.c
-index 20f98a1..1841a83 100644
---- a/afio.c
-+++ b/afio.c
-@@ -3758,7 +3758,8 @@ out (av)
- 
- 	/* ASX check if file changed between the begining
- 	   and end of the backup */
--	if (*fsname)
-+        /* if *fsname==0, it was a control file, so do not check then */
-+	if (*fsname!=0)
- 	{
- 	    struct stat st;
- 	    /* I must check fsname !
-@@ -3773,13 +3774,10 @@ out (av)
- 	        if (st.st_mtime!=sb.sb_mtime)
- 	        {
- 	            warn (fsname, "File was modified during its backup");
-+		    if(index(ignorewarnings,(int)'d')) warnings--;
- 	        }
- 	    }
- 	}
--	else
--	{
--	    warn (name, "ASX no fsname for this name ??");
--        }
- 
- 	if(aflag && *fsname && ((sb.sb_mode & S_IFMT)==S_IFREG))
- 	{
--- 
-2.3.4
-
diff --git a/archive/afio/0002-fix-type-errors.patch b/archive/afio/0002-fix-type-errors.patch
deleted file mode 100644
index 86add96d3a..0000000000
--- a/archive/afio/0002-fix-type-errors.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 264675a1af451647f967dcb2692bba7cc61e65ca Mon Sep 17 00:00:00 2001
-From: Koen Holtman <koen.holtman@ieee.org>
-Date: Mon, 24 Sep 2012 20:59:50 +0200
-Subject: [PATCH 2/5] fix type errors
-
----
- HISTORY |  4 ++++
- afio.c  | 22 +++++++++++-----------
- afio.h  |  6 +++---
- 3 files changed, 18 insertions(+), 14 deletions(-)
-
-diff --git a/HISTORY b/HISTORY
-index cee3916..92b3c2d 100644
---- a/HISTORY
-+++ b/HISTORY
-@@ -988,3 +988,7 @@ reported by Ian Campbell.  Closes Debian bug #686613.
- 
- Added d letter for the -1 option.
- 
-+Fixed two compiler errors (as reported by recent gcc) due to
-+discrepancies between function declarations in afio.h and afio.c.
-+Problem reported by Jari Aalto.  Added some more size_t and ssize_t.
-+
-diff --git a/afio.c b/afio.c
-index 1841a83..3cadb82 100644
---- a/afio.c
-+++ b/afio.c
-@@ -924,8 +924,8 @@ void mail(char *who,int vol,char *archive)
- STATIC VOIDFN
- copyin (char **av)
- {
--  reg int got;
--  reg uint have;
-+  reg ssize_t got;
-+  reg ssize_t have;
- 
-   if (*av)
-     fatal (*av, "Extraneous argument");
-@@ -1080,7 +1080,7 @@ fatal (char *what, char *why)
-  * about write() elsewhere.
-  */
- STATIC
--int writeall(int fd, const char *buf, size_t count)
-+ssize_t writeall(int fd, const char *buf, size_t count)
- {
-  ssize_t put;
-  size_t totalput;
-@@ -1553,12 +1553,12 @@ indata (fd, size, name)
-      reg off_t size;
-      char *name;
- {
--  reg uint chunk;
-+  reg size_t chunk;
-   reg char *oops;
--  reg int sparse;
-+  reg ssize_t sparse;
-   reg int corrupt;
-   auto char *buf;
--  auto uint avail;
-+  auto size_t avail;
- 
-   corrupt = sparse = 0;
-   oops = NULL;
-@@ -4247,8 +4247,8 @@ passdata (from, ifd, to, ofd)
-      char *to;
-      reg int ofd;
- {
--  reg int got;
--  reg int sparse;
-+  reg ssize_t got;
-+  reg ssize_t sparse;
-   auto char block[FSBUF];
- 
-   if (ifd)
-@@ -4262,7 +4262,7 @@ passdata (from, ifd, to, ofd)
- 	VOID warn (got < 0 ? from : to, syserr ());
-       else if (sparse > 0
- 	       && (lseek (ofd, (off_t) - sparse, 1) < 0
--		   || writeall (ofd, block, (uint) sparse) != sparse))
-+		   || writeall (ofd, block, sparse) != sparse))
- 	VOID warn (to, syserr ());
-     }
-   VOID close (ofd);
-@@ -4523,11 +4523,11 @@ rmdir (name)
-  * 0 if the block was written, the given length for a sparse
-  * block or -1 if unsuccessful.
-  */
--STATIC int
-+STATIC ssize_t
- fswrite (fd, buf, len)
-      int fd;
-      char *buf;
--     uint len;
-+     size_t len;
- {
-   reg char *bidx;
-   reg char *bend;
-diff --git a/afio.h b/afio.h
-index 79ed760..e676d68 100644
---- a/afio.h
-+++ b/afio.h
-@@ -446,7 +446,7 @@ int openotty (char *, Stat *, Link *, int, int);
- int openqtty (void);
- int options (int, char **, char *);
- VOIDFN out (char **);
--void outalloc (uint);
-+void outalloc (size_t);
- size_t outavail (char **);
- int outdata (int, char*, off_t);
- 
-@@ -481,7 +481,7 @@ int rmdir (char *);
- #if !defined (linux) && !defined(__FreeBSD__) && !defined(sun) && !defined(__CYGWIN32__)
- VOIDFN (*signal ())();
- #endif
--     int fswrite (int, char*, uint);
-+     ssize_t fswrite (int, char*, size_t);
-      char *syserr (void);
-      VOIDFN toc (char **);
-      void tocentry (char *, Stat *);
-@@ -497,7 +497,7 @@ VOIDFN (*signal ())();
-      int xwait (int, char *, int);
-      void mail(char *who,int vol,char *archive);
- 
--int writeall(int, const char*, unsigned int);
-+ssize_t writeall(int, const char*, size_t);
- int incheckentry(char *, Stat *);
- int incheckdata (int fd, off_t size, char *name, Stat *asb, int comp);
- Link * linkinode16 (dev_t dev, ino_t ino);
--- 
-2.3.4
-
diff --git a/archive/afio/0003-fix-uint-size_t.patch b/archive/afio/0003-fix-uint-size_t.patch
deleted file mode 100644
index 2ebb512cf9..0000000000
--- a/archive/afio/0003-fix-uint-size_t.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 33cff189ff0f0d2d2f735211d72f1929db74485e Mon Sep 17 00:00:00 2001
-From: Koen Holtman <koen.holtman@ieee.org>
-Date: Tue, 25 Sep 2012 20:27:10 +0200
-Subject: [PATCH 3/5] fix uint/size_t
-
----
- Makefile | 4 ++--
- afio.c   | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index cdb71e4..e9db102 100644
---- a/Makefile
-+++ b/Makefile
-@@ -68,8 +68,8 @@ g	= -DHAVEFNMATCH
- LARGEFILEFLAGS=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
- 
- # even more warnings flags..
--MW=
--#MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations
-+#MW=-Wformat -Werror=format-security -Wall
-+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)
- 
-diff --git a/afio.c b/afio.c
-index 3cadb82..c9092ba 100644
---- a/afio.c
-+++ b/afio.c
-@@ -1558,7 +1558,7 @@ indata (fd, size, name)
-   reg ssize_t sparse;
-   reg int corrupt;
-   auto char *buf;
--  auto size_t avail;
-+  auto uint avail;
- 
-   corrupt = sparse = 0;
-   oops = NULL;
--- 
-2.3.4
-
diff --git a/archive/afio/0004-makefile-uncomment-fix.patch b/archive/afio/0004-makefile-uncomment-fix.patch
deleted file mode 100644
index 3a2673d842..0000000000
--- a/archive/afio/0004-makefile-uncomment-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 822904b09b36d70a40720b71c6a88ee17826726d Mon Sep 17 00:00:00 2001
-From: Koen Holtman <koen.holtman@ieee.org>
-Date: Tue, 25 Sep 2012 20:28:32 +0200
-Subject: [PATCH 4/5] makefile uncomment fix
-
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index e9db102..cde1a7b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -68,8 +68,8 @@ g	= -DHAVEFNMATCH
- LARGEFILEFLAGS=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
- 
- # even more warnings flags..
--#MW=-Wformat -Werror=format-security -Wall
--MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations
-+MW=-Wformat -Werror=format-security -Wall
-+#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)
- 
--- 
-2.3.4
-
diff --git a/archive/afio/0005-fix-o-0-vv-formatting-bug.patch b/archive/afio/0005-fix-o-0-vv-formatting-bug.patch
deleted file mode 100644
index 1c4c23f518..0000000000
--- a/archive/afio/0005-fix-o-0-vv-formatting-bug.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 897262d76eaeb37c8976b5c92a4ad5594b6f01a0 Mon Sep 17 00:00:00 2001
-From: Koen Holtman <koen.holtman@ieee.org>
-Date: Mon, 12 Nov 2012 23:04:49 +0100
-Subject: [PATCH 5/5] fix -o -0 -vv formatting bug
-
----
- HISTORY |  3 +++
- afio.c  | 16 +++++++---------
- 2 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/HISTORY b/HISTORY
-index 92b3c2d..78d5476 100644
---- a/HISTORY
-+++ b/HISTORY
-@@ -992,3 +992,6 @@ Fixed two compiler errors (as reported by recent gcc) due to
- discrepancies between function declarations in afio.h and afio.c.
- Problem reported by Jari Aalto.  Added some more size_t and ssize_t.
- 
-+Fixed formatting bug to restore output behavior of afio -o -0 -vv like
-+it was in afio 2.5.  Based on bug report by Corey Mann.  Closes Debian
-+bug #420654.
-diff --git a/afio.c b/afio.c
-index c9092ba..2875348 100644
---- a/afio.c
-+++ b/afio.c
-@@ -4684,15 +4684,13 @@ tocentry (name, asb)
-     else
-       namedot = 0;
- 
--    if (ISCONTROL(asb))
--	res = printf("//--%s",name);
-+    if (ISCONTROL(asb))	res = printf("//--");
-+
-+    if ((!useoutmodetoc) && flag0)
-+      res = printf ("%s%c", name, 0);
-     else
--     {
--	if (flag0)
--		res = printf ("%s%c", name, 0);
--	else
--		res = printf ("%s", name);
--     }
-+      res = printf ("%s", name);
-+    
-     /* to find out about broken pipe as early as possible */
-     if(res > 0) res = fflush(stdout);
-     /* check for broken pipe on stdout, this ends the listing */
-@@ -4752,7 +4750,7 @@ tocentry (name, asb)
- #endif /* S_IFLNK */
-     }
- 
--  if (!flag0)
-+  if ((!flag0)||useoutmodetoc)
-     putchar ('\n');
- }
- 
--- 
-2.3.4
-
diff --git a/archive/afio/DETAILS b/archive/afio/DETAILS
index 3b389e1dcd..c3209354e2 100755
--- a/archive/afio/DETAILS
+++ b/archive/afio/DETAILS
@@ -1,12 +1,12 @@
            SPELL=afio
-         VERSION=2.5.1-2
+         VERSION=2.5.2
           SOURCE=$SPELL-$VERSION.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=https://github.com/kholtman/afio/archive/v${VERSION}.tar.gz
         WEB_SITE=https://github.com/kholtman/afio
          ENTERED=20010923
       PATCHLEVEL=1
-     SOURCE_HASH=sha512:7522e513aaea54bae0519c868cc7c1926d6691f763fc45383c76c67e5a4ff5553edb628f97be42e60d9755b06323021fe05ac5d52e25ec8a28eb9069ef433bdd
+     SOURCE_HASH=sha512:e0fb9b2d31bb912d7f30d8dd992cffcc99a84424c7386082abb8da82a1911b852c5a80e8135f0b6266113519f582dba45dc3c87c8f3b822a2daa14a1ae1d9944
       LICENSE[0]=LGPL
         KEYWORDS="archive"
 SHORT="A cpio-compatible archive/backup program."
diff --git a/archive/afio/HISTORY b/archive/afio/HISTORY
index 79ec15f93e..d36b882051 100644
--- a/archive/afio/HISTORY
+++ b/archive/afio/HISTORY
@@ -1,3 +1,7 @@
+2019-12-31 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DETAILS: version 2.5.2
+	* PRE_BUILD, *.patch: remove obsolete patches
+
 2016-01-23 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* DETAILS: add missing checksum
 
diff --git a/archive/afio/PRE_BUILD b/archive/afio/PRE_BUILD
deleted file mode 100755
index c038139131..0000000000
--- a/archive/afio/PRE_BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-default_pre_build      &&
-cd ${SOURCE_DIRECTORY} &&
-
-patch -p1 < ${SPELL_DIRECTORY}/0001-fix-incorrect-error-reporting-on-including-control-f.patch &&
-patch -p1 < ${SPELL_DIRECTORY}/0002-fix-type-errors.patch           &&
-patch -p1 < ${SPELL_DIRECTORY}/0003-fix-uint-size_t.patch           &&
-patch -p1 < ${SPELL_DIRECTORY}/0004-makefile-uncomment-fix.patch    &&
-patch -p1 < ${SPELL_DIRECTORY}/0005-fix-o-0-vv-formatting-bug.patch