From 717972e6a0a6f8ccecad9d9ade1e68c32e0d27ef Mon Sep 17 00:00:00 2001
From: riggs <riggs@FreeBSD.org>
Date: Sun, 29 Nov 2015 16:52:05 +0000
Subject: Fix runtime segfault due to uninitialised variable, bump PORTREVISION

While on it:
- Pet portlint: regenerate patches using 'make makepatch'
- Add LICENSE

PR:		204845
Submitted by:	yama@jasper.co.jp
MFH:		2015Q4 (ports-secteam fix blanket)
---
 comms/efax/Makefile                 |  5 ++-
 comms/efax/files/patch-Makefile     | 41 +++++++++++++++++++++
 comms/efax/files/patch-efaxmsg.c    | 36 ++++++++++++++++++
 comms/efax/files/patch-fax          | 73 +++++++++++++++++++++++++++++++++++++
 comms/efax/files/patch-src_Makefile | 41 ---------------------
 comms/efax/files/patch-src_fax      | 73 -------------------------------------
 6 files changed, 154 insertions(+), 115 deletions(-)
 create mode 100644 comms/efax/files/patch-Makefile
 create mode 100644 comms/efax/files/patch-efaxmsg.c
 create mode 100644 comms/efax/files/patch-fax
 delete mode 100644 comms/efax/files/patch-src_Makefile
 delete mode 100644 comms/efax/files/patch-src_fax

(limited to 'comms')

diff --git a/comms/efax/Makefile b/comms/efax/Makefile
index 5db25aa6ac23..225659709c0a 100644
--- a/comms/efax/Makefile
+++ b/comms/efax/Makefile
@@ -3,13 +3,16 @@
 
 PORTNAME=	efax-0.9a
 PORTVERSION=	001114a7
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	comms
 MASTER_SITES=	http://shino.pos.to/linux/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fax send/receive program
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 RUN_DEPENDS=xloadimage:${PORTSDIR}/x11/xloadimage
 
 DOCSDIR=	${PREFIX}/share/doc/efax
diff --git a/comms/efax/files/patch-Makefile b/comms/efax/files/patch-Makefile
new file mode 100644
index 000000000000..5a3c9e9f8084
--- /dev/null
+++ b/comms/efax/files/patch-Makefile
@@ -0,0 +1,41 @@
+--- Makefile.orig	2000-06-29 02:01:22 UTC
++++ Makefile
+@@ -3,20 +3,17 @@
+ # Change the following to the name of your ANSI C compiler
+ # (normally gcc).
+ 
+-CC=gcc
++CC?=cc
+ 
+ # Compile/load options. Add -DNO_STRERROR to CFLAGS if _strerror
+ # is undefined
+ 
+-CFLAGS=
+-LDFLAGS=
+-
+ # Change the following to the destination directories for
+ # binaries and man pages. Probably /usr/bin and /usr/man on
+ # Linux, /usr/local/{bin,man} on other systems.
+ 
+-BINDIR=/usr/bin
+-MANDIR=/usr/man
++BINDIR=$(PREFIX)/bin
++MANDIR=$(PREFIX)/man
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) -c $<
+@@ -32,11 +29,9 @@ efix:	efix.o efaxlib.o efaxmsg.o
+ 	strip efix
+ 
+ install:
+-	cp fax efax efix $(BINDIR)
+-	chmod 755 $(BINDIR)/fax $(BINDIR)/efax $(BINDIR)/efix
+-	cp fax.1 efax.1 efix.1 $(MANDIR)/man1
+-	chmod 644 $(MANDIR)/man1/fax.1 $(MANDIR)/man1/efax.1  \
+-		$(MANDIR)/man1/efix.1
++	$(INSTALL_PROGRAM) efax efix $(BINDIR)
++	$(INSTALL_SCRIPT)  fax $(BINDIR)
++	$(INSTALL_DATA) fax.1 efax.1 efix.1 $(MANDIR)/man1
+ 
+ clean:	
+ 	rm -f efax efix efax.o efix.o efaxlib.o efaxio.o efaxos.o efaxmsg.o
diff --git a/comms/efax/files/patch-efaxmsg.c b/comms/efax/files/patch-efaxmsg.c
new file mode 100644
index 000000000000..1ae052080897
--- /dev/null
+++ b/comms/efax/files/patch-efaxmsg.c
@@ -0,0 +1,36 @@
+--- efaxmsg.c.orig	1999-03-20 04:38:20 UTC
++++ efaxmsg.c
+@@ -98,9 +98,6 @@ int msg ( char *fmt, ... ) 
+   int err=0, i, flags=0 ;
+   char *p ;
+   
+-  va_list ap ;
+-  va_start ( ap, fmt ) ;
+-
+   if ( ! init ) {
+     logfile[0] = stderr ;
+     logfile[1] = stdout ;
+@@ -112,6 +109,9 @@ int msg ( char *fmt, ... ) 
+   
+   for ( i=0 ; i<NLOG ; i++ ) {
+ 
++    va_list ap ;
++    va_start ( ap, fmt ) ;
++
+     for ( p=fmt ; *p ; p++ ) {
+       switch ( *p ) {
+       case ' ': p++ ; goto print ;
+@@ -148,11 +148,11 @@ int msg ( char *fmt, ... ) 
+       if ( ! ( flags & NOFLSH ) ) fflush ( logfile[i] ) ;
+       
+     }
++  
++    va_end ( ap ) ;
+     
+   }
+   
+-  va_end ( ap ) ;
+-  
+   return err ;
+ }
+ 
diff --git a/comms/efax/files/patch-fax b/comms/efax/files/patch-fax
new file mode 100644
index 000000000000..dc7920ac773d
--- /dev/null
+++ b/comms/efax/files/patch-fax
@@ -0,0 +1,73 @@
+--- fax.orig	2002-02-02 13:14:08 UTC
++++ fax
+@@ -24,7 +24,7 @@ echo "fax: version 0.9001114a7 (30 Jan 2
+ #  - do not put spaces before or after the equal (=) signs.
+ #
+ #  - variables can also be set on the command line, for example:
+-#       fax DEV=cua0 send file.ps
++#       fax DEV=cuaa0 send file.ps
+ #    or in a configuration file (see CONFIGFILES below)
+ #
+ 
+@@ -36,16 +36,16 @@ EFAX=efax
+ EFIX=efix
+ 
+ # The device to which the fax modem is connected (e.g. ttya for
+-# /dev/ttya).  Use a dial-out (cua) device if available.  If
++# /dev/ttya).  Use a dial-out (cuaa) device if available.  If
+ # there are links to this device then all programs must use same
+ # name or the UUCP locking mechanism will fail.  For example, if
+-# /dev/modem is a link to /dev/cua1, then getty, uucp, kermit,
+-# pppd, dip, etc. must *all* use either /dev/modem or /dev/cua1.
++# /dev/modem is a link to /dev/cuaa1, then getty, uucp, kermit,
++# pppd, dip, etc. must *all* use either /dev/modem or /dev/cuaa1.
+ 
+ # 19 Aug 2001 changed by Masaki Shinomiya, 
+ # because 'man efax' sais the default is /dev/modem.
+ DEV=modem
+-#DEV=cua1
++#DEV=cuaa1
+ 
+ # Your fax number in international format, 20 characters maximum.
+ # Use only digits, spaces, and the "+" character.
+@@ -98,7 +98,8 @@ DIALSUFFIX=""
+ # conventions. Protect with single quotes for delayed evaluation.
+ # Add a leading '#' to the file name to use binary format.
+ 
+-LOCK='-x /var/lock/LCK..$DEV' 			# modern systems
++LOCK='-x /var/spool/lock/LCK..$DEV'		# FreeBSD
++# LOCK='-x /var/lock/LCK..$DEV' 		# modern systems
+ # LOCK='-x /usr/spool/uucp/LCK..$DEV'		# older systems
+ # LOCK='-x /var/lock/LCK..$DEV -x /var/spool/uucp/LCK..$DEV' # both
+ # LOCK='-x #/usr/spool/uucp/LCK..$DEV'		# binary format
+@@ -124,7 +125,7 @@ LOCK='-x /var/lock/LCK..$DEV' 			# moder
+ # out if you don't need to use config files. Warning: any type of
+ # shell command in these files will be executed.
+ 
+-CONFIGFILES="/etc/efax.rc ${HOME:-~}/.efaxrc ./.efaxrc"
++CONFIGFILES="%%PREFIX%%/etc/efax.rc ${HOME:-~}/.efaxrc ./.efaxrc"
+ 
+ # A command that will generate unique names for logs and received
+ # files.  'date +%m%d%H%M%S' works on most systems.  Protect with
+@@ -421,9 +422,9 @@ VCMD="exec $FONE %d"
+ # efax even if a previous process (e.g. login) has changed it.
+ # Comment out if you don't need to reset device ownership.
+ 
+-OWNER=root.tty		# typical
+-MODE=666		# anybody
+-# MODE=660		# only owner & group
++OWNER=uucp:dialer		# typical
++#MODE=666		# anybody
++MODE=660		# only owner & group
+ 
+ # Regular expression for efax exit codes in log files that will
+ # *not* be saved.  For example, use [145] to ignore exits due to
+@@ -1101,7 +1102,7 @@ cat 1>&2 <<EOF
+ 
+  if given no arguments, answers the phone and receives a fax.
+ 
+- use VAR=value to set variables (e.g. "fax DEV=cua2 receive")
++ use VAR=value to set variables (e.g. "fax DEV=cuaa2 receive")
+ 
+  session logs are written to a file with the date/time as the
+  file name and extension of .log (except for automatic reception).
diff --git a/comms/efax/files/patch-src_Makefile b/comms/efax/files/patch-src_Makefile
deleted file mode 100644
index 30d6d5985b11..000000000000
--- a/comms/efax/files/patch-src_Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
---- Makefile.orig	Wed Jun 28 19:01:22 2000
-+++ Makefile	Sun Oct 20 03:06:13 2002
-@@ -3,20 +3,17 @@
- # Change the following to the name of your ANSI C compiler
- # (normally gcc).
- 
--CC=gcc
-+CC?=cc
- 
- # Compile/load options. Add -DNO_STRERROR to CFLAGS if _strerror
- # is undefined
- 
--CFLAGS=
--LDFLAGS=
--
- # Change the following to the destination directories for
- # binaries and man pages. Probably /usr/bin and /usr/man on
- # Linux, /usr/local/{bin,man} on other systems.
- 
--BINDIR=/usr/bin
--MANDIR=/usr/man
-+BINDIR=$(PREFIX)/bin
-+MANDIR=$(PREFIX)/man
- 
- .c.o:
- 	$(CC) $(CFLAGS) -c $<
-@@ -32,11 +29,9 @@
- 	strip efix
- 
- install:
--	cp fax efax efix $(BINDIR)
--	chmod 755 $(BINDIR)/fax $(BINDIR)/efax $(BINDIR)/efix
--	cp fax.1 efax.1 efix.1 $(MANDIR)/man1
--	chmod 644 $(MANDIR)/man1/fax.1 $(MANDIR)/man1/efax.1  \
--		$(MANDIR)/man1/efix.1
-+	$(INSTALL_PROGRAM) efax efix $(BINDIR)
-+	$(INSTALL_SCRIPT)  fax $(BINDIR)
-+	$(INSTALL_DATA) fax.1 efax.1 efix.1 $(MANDIR)/man1
- 
- clean:	
- 	rm -f efax efix efax.o efix.o efaxlib.o efaxio.o efaxos.o efaxmsg.o
diff --git a/comms/efax/files/patch-src_fax b/comms/efax/files/patch-src_fax
deleted file mode 100644
index 497c20070088..000000000000
--- a/comms/efax/files/patch-src_fax
+++ /dev/null
@@ -1,73 +0,0 @@
---- fax.orig	Sat May 11 12:39:37 2002
-+++ fax	Sat May 11 13:42:33 2002
-@@ -24,7 +24,7 @@
- #  - do not put spaces before or after the equal (=) signs.
- #
- #  - variables can also be set on the command line, for example:
--#       fax DEV=cua0 send file.ps
-+#       fax DEV=cuaa0 send file.ps
- #    or in a configuration file (see CONFIGFILES below)
- #
- 
-@@ -36,16 +36,16 @@
- EFIX=efix
- 
- # The device to which the fax modem is connected (e.g. ttya for
--# /dev/ttya).  Use a dial-out (cua) device if available.  If
-+# /dev/ttya).  Use a dial-out (cuaa) device if available.  If
- # there are links to this device then all programs must use same
- # name or the UUCP locking mechanism will fail.  For example, if
--# /dev/modem is a link to /dev/cua1, then getty, uucp, kermit,
--# pppd, dip, etc. must *all* use either /dev/modem or /dev/cua1.
-+# /dev/modem is a link to /dev/cuaa1, then getty, uucp, kermit,
-+# pppd, dip, etc. must *all* use either /dev/modem or /dev/cuaa1.
- 
- # 19 Aug 2001 changed by Masaki Shinomiya, 
- # because 'man efax' sais the default is /dev/modem.
- DEV=modem
--#DEV=cua1
-+#DEV=cuaa1
- 
- # Your fax number in international format, 20 characters maximum.
- # Use only digits, spaces, and the "+" character.
-@@ -98,7 +98,8 @@
- # conventions. Protect with single quotes for delayed evaluation.
- # Add a leading '#' to the file name to use binary format.
- 
--LOCK='-x /var/lock/LCK..$DEV' 			# modern systems
-+LOCK='-x /var/spool/lock/LCK..$DEV'		# FreeBSD
-+# LOCK='-x /var/lock/LCK..$DEV' 		# modern systems
- # LOCK='-x /usr/spool/uucp/LCK..$DEV'		# older systems
- # LOCK='-x /var/lock/LCK..$DEV -x /var/spool/uucp/LCK..$DEV' # both
- # LOCK='-x #/usr/spool/uucp/LCK..$DEV'		# binary format
-@@ -124,7 +125,7 @@
- # out if you don't need to use config files. Warning: any type of
- # shell command in these files will be executed.
- 
--CONFIGFILES="/etc/efax.rc ${HOME:-~}/.efaxrc ./.efaxrc"
-+CONFIGFILES="%%PREFIX%%/etc/efax.rc ${HOME:-~}/.efaxrc ./.efaxrc"
- 
- # A command that will generate unique names for logs and received
- # files.  'date +%m%d%H%M%S' works on most systems.  Protect with
-@@ -421,9 +422,9 @@
- # efax even if a previous process (e.g. login) has changed it.
- # Comment out if you don't need to reset device ownership.
- 
--OWNER=root.tty		# typical
--MODE=666		# anybody
--# MODE=660		# only owner & group
-+OWNER=uucp:dialer		# typical
-+#MODE=666		# anybody
-+MODE=660		# only owner & group
- 
- # Regular expression for efax exit codes in log files that will
- # *not* be saved.  For example, use [145] to ignore exits due to
-@@ -1101,7 +1102,7 @@
- 
-  if given no arguments, answers the phone and receives a fax.
- 
-- use VAR=value to set variables (e.g. "fax DEV=cua2 receive")
-+ use VAR=value to set variables (e.g. "fax DEV=cuaa2 receive")
- 
-  session logs are written to a file with the date/time as the
-  file name and extension of .log (except for automatic reception).
-- 
cgit