Attachment #203731 for bug #237324

Lines 1-2 Link Here

(-)./distinfo (-2 / +3 lines)
1	SHA256 (afio-2.5.tgz) = e7801a0f0a8dcbae41f4156dee5dae2a34a558d6c3ceac517efad4fed610ff2e	1	TIMESTAMP = 1555483777
2	SIZE (afio-2.5.tgz) = 179184	2	SHA256 (afio-2.5.2.tgz) = c64ca14109df547e25702c9f3a9ca877881cd4bf38dcbe90fbd09c8d294f42b9
		3	SIZE (afio-2.5.2.tgz) = 194030




*** afio.c.orig	Sat Dec 20 17:16:13 2003
--- afio.c	Sat Jan 21 17:31:23 2006
***************
*** 648,658 ****
           daniel.andersson@sto.sema.se  */
        fprintf (stderr, "Media size %ld is less than block size %d\n",
                 aruntil, arbsize);    
  #else
        fprintf (stderr, "Media size %ld is less than block size %d\n",
! 	       (unsigned long) aruntil, arbsize);
  #endif
     usage ();
      }
    if (arpad == 0)
      arpad = arbsize;
--- 648,658 ----
           daniel.andersson@sto.sema.se  */
        fprintf (stderr, "Media size %ld is less than block size %d\n",
                 aruntil, arbsize);    
  #else
        fprintf (stderr, "Media size %ld is less than block size %d\n",
! 	       (u_long) aruntil, arbsize);
  #endif
     usage ();
      }
    if (arpad == 0)
      arpad = arbsize;
***************
*** 3155,3168 ****
  	    return (warn (name, syserr ()));
  	  else
  	    exists = 0;
  	}
  
!       if (mknod (name, asb->sb_mode, asb->sb_rdev) < 0
  	  && (errno != ENOENT
  	      || dirneed (name) < 0
! 	      || mknod (name, asb->sb_mode, asb->sb_rdev) < 0))
  	return (warn (name, syserr ()));
        break;
      case S_IFDIR:
        if (exists)
  	{
--- 3155,3168 ----
  	    return (warn (name, syserr ()));
  	  else
  	    exists = 0;
  	}
  
!       if (mkfifo (name, asb->sb_mode) < 0
  	  && (errno != ENOENT
  	      || dirneed (name) < 0
! 	      || mkfifo (name, asb->sb_mode) < 0))
  	return (warn (name, syserr ()));
        break;
      case S_IFDIR:
        if (exists)
  	{
***************
*** 3194,3204 ****
  		   || dirneed (name) < 0
  		   || mkfifo (name, asb->sb_mode) < 0))
  	return (warn (name, syserr ()));
        break;
  #endif /* S_IFIFO */
! #ifdef	S_IFSOCK
      case S_IFSOCK:
        fd = 0;
        if (exists)
  	if (perm != operm && chmod (name, perm) < 0)
  	  return (warn (name, syserr ()));
--- 3194,3204 ----
  		   || dirneed (name) < 0
  		   || mkfifo (name, asb->sb_mode) < 0))
  	return (warn (name, syserr ()));
        break;
  #endif /* S_IFIFO */
! #ifdef	S_IFSOCK && !defined (__FreeBSD__)
      case S_IFSOCK:
        fd = 0;
        if (exists)
  	if (perm != operm && chmod (name, perm) < 0)
  	  return (warn (name, syserr ()));




--- afio.h.orig	Sun Sep 20 04:04:54 1998
+++ afio.h	Wed Dec  9 01:33:32 1998
@@ -1,5 +1,9 @@
 /* afio.h  defines for afio. */
 
+#ifdef HAVE_PARAM_H
+#include <sys/param.h>
+#endif
+
 #ifdef	SYSTIME
 #include <sys/time.h>
 #else /* SYSTIME */

Lines 1-11 Link Here

(-)./files/patch-compfile.c (-11 lines)
1	--- compfile.c.orig Thu Nov 25 22:22:28 1999
2	+++ compfile.c Thu Jan 27 14:36:31 2000
3	@@ -207,7 +207,7 @@
4	* version;
5	*/
6
7	-#if ( defined(sun) && defined(__svr4__) )
8	+#if ( defined(sun) && defined(__svr4__) \|\| defined(__FreeBSD__) )
9	#include <dirent.h>
10	#else
11	#include <sys/dir.h>




--- Makefile.orig	2018-11-30 14:25:04 UTC
+++ 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.
-d	= -DDEFFMTCMD='"fdformat /dev/fd0H1440"'
+d	= -DDEFFMTCMD='"/usr/sbin/fdformat -f 1440 /dev/fd0"'
 ##  Define LONGZFILE if you want .Z to be tagged on the end of a 14 char

+## Define HAVE_PARAM_H if your system has sys/param.h. This is used for BSD
+#  detection.
+
+h	= -DHAVE_PARAM_H
+
 # fnmatch() is in the gnu C library, so it is directly available on
 # Linux.  If your system (e.g. SCO) does not have the gnu C library,
 # unpack the archive gnu.fnmatch.tar.gz and uncomment the following
@@ -74,13 +79,15 @@ 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 -Wno-unused-result $(LARGEFILEFLAGS) $(MW)
+#CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer -Wno-unused-result $(LARGEFILEFLAGS) $(MW)
+CFLAGS1 = -fomit-frame-pointer
 
-CC=gcc
+#CC=gcc
+#CC=cc
 
 # also using contents of usin CPPFLAGS, CFLAGS, LDFLAGS out of environment
 # variables, if they exist
-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
+CFLAGS += $(CFLAGS1) $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $f $g $I
 LDFLAGS +=
 CPPFLAGS +=
 
@@ -95,8 +102,8 @@ clean:
@@ -88,8 +96,9 @@ clean:
 	cd regtest; /bin/sh regtest.clean
 
 install: afio

-	cp afio.1 /usr/share/man/man1
+	${BSD_INSTALL_PROGRAM} afio ${DESTDIR}${PREFIX}/bin
+	${BSD_INSTALL_MAN} afio.1 ${DESTDIR}${PREFIX}/man/man1
+
 
 # generate default list of -E extensions from manpage
 # note: on sun, I had to change awk command below to nawk or gawk

Lines 5-11 Link Here

(-)./files/pkg-message.in (-1 / +1 lines)
5		5
6	PLEASE SEE	6	PLEASE SEE
7		7
8	%%PREFIX%%/share/docs/afio/README	8	%%PREFIX%%/share/doc/afio/README
9		9
10	for details.	10	for details.
11		11




# $FreeBSD: head/sysutils/afio/Makefile 454874 2017-11-25 09:00:15Z amdmi3 $

PORTNAME=	afio
PORTVERSION=	2.5.2
PORTREVISION=	1
CATEGORIES=	sysutils
MASTER_SITES=	http://members.chello.nl/~k.holtman/

MAINTAINER=	portmaster@BSDforge.com
COMMENT=	Archiver and backup program with builtin compression

LICENSE=	ART20 BSD2CLAUSE
LICENSE_COMB=	multi

USES=		tar:tgz

EXAMPLES_USES=	shebangfix
EXAMPLES_SHEBANG_FILES=	${WRKSRC}/script1/backup ${WRKSRC}/script2/backup

ALL_TARGET=	${PORTNAME}


Lines 1-9 Link Here

(-)./pkg-descr (-8 / +5 lines)
1	Afio makes cpio-format archives. It deals fairly gracefully	1	Afio makes cpio-format archives. It deals somewhat gracefully with input data
2	with potential input data corruption. Supports multi-volume	2	corruption, supports multi-volume archives during interactive operation, and
3	archives during interactive operation. Afio can make	3	can make compressed archives that are much safer than compressed tar or cpio
4	compressed archives that are much safer than compressed tar,	4	archives. Afio is best used as an `archive engine' in a backup script.
5	or cpio archives. Afio has a tremendous number of options.
6	Afio might be best used as an `archive engine' in a backup
7	script.
8		5
9	WWW: https://BSDforge.com/projects/sysutils/afio/	6	WWW: http://members.chello.nl/k.holtman/afio.html

Return to bug 237324

Lines 1-83 Link Here

(-)./files/patch-afio.c (-83 lines)
1	*** afio.c.orig Sat Dec 20 17:16:13 2003
2	--- afio.c Sat Jan 21 17:31:23 2006
3	***************
4	* 648,658 **
5	daniel.andersson@sto.sema.se */
6	fprintf (stderr, "Media size %ld is less than block size %d\n",
7	aruntil, arbsize);
8	#else
9	fprintf (stderr, "Media size %ld is less than block size %d\n",
10	! (unsigned long) aruntil, arbsize);
11	#endif
12	usage ();
13	}
14	if (arpad == 0)
15	arpad = arbsize;
16	--- 648,658 ----
17	daniel.andersson@sto.sema.se */
18	fprintf (stderr, "Media size %ld is less than block size %d\n",
19	aruntil, arbsize);
20	#else
21	fprintf (stderr, "Media size %ld is less than block size %d\n",
22	! (u_long) aruntil, arbsize);
23	#endif
24	usage ();
25	}
26	if (arpad == 0)
27	arpad = arbsize;
28	***************
29	* 3155,3168 **
30	return (warn (name, syserr ()));
31	else
32	exists = 0;
33	}
34
35	! if (mknod (name, asb->sb_mode, asb->sb_rdev) < 0
36	&& (errno != ENOENT
37	\|\| dirneed (name) < 0
38	! \|\| mknod (name, asb->sb_mode, asb->sb_rdev) < 0))
39	return (warn (name, syserr ()));
40	break;
41	case S_IFDIR:
42	if (exists)
43	{
44	--- 3155,3168 ----
45	return (warn (name, syserr ()));
46	else
47	exists = 0;
48	}
49
50	! if (mkfifo (name, asb->sb_mode) < 0
51	&& (errno != ENOENT
52	\|\| dirneed (name) < 0
53	! \|\| mkfifo (name, asb->sb_mode) < 0))
54	return (warn (name, syserr ()));
55	break;
56	case S_IFDIR:
57	if (exists)
58	{
59	***************
60	* 3194,3204 **
61	\|\| dirneed (name) < 0
62	\|\| mkfifo (name, asb->sb_mode) < 0))
63	return (warn (name, syserr ()));
64	break;
65	#endif /* S_IFIFO */
66	! #ifdef S_IFSOCK
67	case S_IFSOCK:
68	fd = 0;
69	if (exists)
70	if (perm != operm && chmod (name, perm) < 0)
71	return (warn (name, syserr ()));
72	--- 3194,3204 ----
73	\|\| dirneed (name) < 0
74	\|\| mkfifo (name, asb->sb_mode) < 0))
75	return (warn (name, syserr ()));
76	break;
77	#endif /* S_IFIFO */
78	! #ifdef S_IFSOCK && !defined (__FreeBSD__)
79	case S_IFSOCK:
80	fd = 0;
81	if (exists)
82	if (perm != operm && chmod (name, perm) < 0)
83	return (warn (name, syserr ()));

Lines 1-12 Link Here

(-)./files/patch-afio.h (-12 lines)
1	--- afio.h.orig Sun Sep 20 04:04:54 1998
2	+++ afio.h Wed Dec 9 01:33:32 1998
3	@@ -1,5 +1,9 @@
4	/* afio.h defines for afio. */
5
6	+#ifdef HAVE_PARAM_H
7	+#include <sys/param.h>
8	+#endif
9	+
10	#ifdef SYSTIME
11	#include <sys/time.h>
12	#else /* SYSTIME */

Lines 1-9 Link Here

(-)./files/patch-Makefile (-16 / +16 lines)
1	--- Makefile.orig 2003-12-21 10:23:51 UTC	1	--- Makefile.orig 2018-11-30 14:25:04 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -28,7 +28,7 @@ SHELL=/bin/sh	3	@@ -28,7 +28,7 @@ SHELL=/bin/sh
4	c = -DHAVEMEMCMP	4	c = -DHAVEMEMCMP
5	## Define DEFFMTCMD to being how to format the media you use the most	5	## Define DEFFMTCMD to being how to format the media you use the most
6	## This is the DEFault FoRMat CoManD.	6	## This is the DEFault FoRMat CoManD.
7	-d = -DDEFFMTCMD='"fdformat /dev/fd0H1440"'	7	-d = -DDEFFMTCMD='"fdformat /dev/fd0H1440"'
8	+d = -DDEFFMTCMD='"/usr/sbin/fdformat -f 1440 /dev/fd0"'	8	+d = -DDEFFMTCMD='"/usr/sbin/fdformat -f 1440 /dev/fd0"'
9	## Define LONGZFILE if you want .Z to be tagged on the end of a 14 char	9	## Define LONGZFILE if you want .Z to be tagged on the end of a 14 char
Lines 25-54 Link Here
25	+## Define HAVE_PARAM_H if your system has sys/param.h. This is used for BSD	25	+## Define HAVE_PARAM_H if your system has sys/param.h. This is used for BSD
26	+# detection.	26	+# detection.
27	+	27	+
28	+h = -DHAVE_PARAM_H	28	+h = -DHAVE_PARAM_H
29	+	29	+
30	# fnmatch() is in the gnu C library, so it is directly available on	30	# fnmatch() is in the gnu C library, so it is directly available on
31	# Linux. If your system (e.g. SCO) does not have the gnu C library,	31	# Linux. If your system (e.g. SCO) does not have the gnu C library,
32	# unpack the archive gnu.fnmatch.tar.gz and uncomment the following	32	# unpack the archive gnu.fnmatch.tar.gz and uncomment the following
33	@@ -71,11 +76,14 @@ LARGEFILEFLAGS=-D_FILE_OFFSET_BITS=64 -D	33	@@ -74,13 +79,15 @@ MW=-Wformat -Werror=format-security -Wal
34	MW=	34	#code can be reviewed manually
35	#MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations	35	#MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations
36		36
37	-CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW}	37	-CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer -Wno-unused-result $(LARGEFILEFLAGS) $(MW)
38	+#CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW}	38	+#CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer -Wno-unused-result $(LARGEFILEFLAGS) $(MW)
39	+CFLAGS1 = -fomit-frame-pointer -fno-strength-reduce	39	+CFLAGS1 = -fomit-frame-pointer
40		40
41	-CC=gcc	41	-CC=gcc
42	+#CC=gcc	42	+#CC=gcc
43	+#CC=cc
44		43
45	-CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I	44	# also using contents of usin CPPFLAGS, CFLAGS, LDFLAGS out of environment
46	+#CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I	45	# variables, if they exist
47	+CFLAGS += ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $f $g $h $I	46	-CFLAGS += $(CFLAGS1) $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $(e2) $f $g $I
48	LDFLAGS =	47	+#CFLAGS += $(CFLAGS1) $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $(e2) $f $g $I
		48	+CFLAGS += $(CFLAGS1) $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $f $g $I
		49	LDFLAGS +=
		50	CPPFLAGS +=
49		51
50	afio : afio.o compfile.o exten.o match.o $M	52	@@ -95,8 +102,8 @@ clean:
51	@@ -88,8 +96,9 @@ clean:
52	cd regtest; /bin/sh regtest.clean	53	cd regtest; /bin/sh regtest.clean
53		54
54	install: afio	55	install: afio
Lines 56-62 Link Here
56	- cp afio.1 /usr/share/man/man1	57	- cp afio.1 /usr/share/man/man1
57	+ ${BSD_INSTALL_PROGRAM} afio ${DESTDIR}${PREFIX}/bin	58	+ ${BSD_INSTALL_PROGRAM} afio ${DESTDIR}${PREFIX}/bin
58	+ ${BSD_INSTALL_MAN} afio.1 ${DESTDIR}${PREFIX}/man/man1	59	+ ${BSD_INSTALL_MAN} afio.1 ${DESTDIR}${PREFIX}/man/man1
59	+
60		60
61	# generate default list of -E extensions from manpage	61	# generate default list of -E extensions from manpage
62	# note: on sun, I had to change awk command below to nawk or gawk	62	# note: on sun, I had to change awk command below to nawk or gawk

Lines 2-11 Link Here

(-)./Makefile (-5 / +6 lines)
2	# $FreeBSD: head/sysutils/afio/Makefile 454874 2017-11-25 09:00:15Z amdmi3 $	2	# $FreeBSD: head/sysutils/afio/Makefile 454874 2017-11-25 09:00:15Z amdmi3 $
3		3
4	PORTNAME= afio	4	PORTNAME= afio
5	PORTVERSION= 2.5	5	PORTVERSION= 2.5.2
6	PORTREVISION= 1
7	CATEGORIES= sysutils	6	CATEGORIES= sysutils
8	MASTER_SITES= SUNSITE/system/backup	7	MASTER_SITES= http://members.chello.nl/~k.holtman/
9		8
10	MAINTAINER= portmaster@BSDforge.com	9	MAINTAINER= portmaster@BSDforge.com
11	COMMENT= Archiver and backup program with builtin compression	10	COMMENT= Archiver and backup program with builtin compression
Lines 13-20 COMMENT= Archiver and backup program wit Link Here
13	LICENSE= ART20 BSD2CLAUSE	12	LICENSE= ART20 BSD2CLAUSE
14	LICENSE_COMB= multi	13	LICENSE_COMB= multi
15		14
16	USES= tar:tgz shebangfix	15	USES= tar:tgz
17	SHEBANG_FILES= script1/backup script2/backup	16
		17	EXAMPLES_USES= shebangfix
		18	EXAMPLES_SHEBANG_FILES= ${WRKSRC}/script1/backup ${WRKSRC}/script2/backup
18		19
19	ALL_TARGET= ${PORTNAME}	20	ALL_TARGET= ${PORTNAME}
20		21