Date: Sun, 29 Nov 2015 16:56:06 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r402607 - in branches/2015Q4/comms/efax: . files Message-ID: <201511291656.tATGu6Za055386@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sun Nov 29 16:56:05 2015 New Revision: 402607 URL: https://svnweb.freebsd.org/changeset/ports/402607 Log: MFH: r402606 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 Approved by: ports-secteam (fix blanket) Added: branches/2015Q4/comms/efax/files/patch-Makefile - copied unchanged from r402606, head/comms/efax/files/patch-Makefile branches/2015Q4/comms/efax/files/patch-efaxmsg.c - copied unchanged from r402606, head/comms/efax/files/patch-efaxmsg.c branches/2015Q4/comms/efax/files/patch-fax - copied unchanged from r402606, head/comms/efax/files/patch-fax Deleted: branches/2015Q4/comms/efax/files/patch-src_Makefile branches/2015Q4/comms/efax/files/patch-src_fax Modified: branches/2015Q4/comms/efax/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/comms/efax/Makefile ============================================================================== --- branches/2015Q4/comms/efax/Makefile Sun Nov 29 16:52:05 2015 (r402606) +++ branches/2015Q4/comms/efax/Makefile Sun Nov 29 16:56:05 2015 (r402607) @@ -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 Copied: branches/2015Q4/comms/efax/files/patch-Makefile (from r402606, head/comms/efax/files/patch-Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/comms/efax/files/patch-Makefile Sun Nov 29 16:56:05 2015 (r402607, copy of r402606, head/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 Copied: branches/2015Q4/comms/efax/files/patch-efaxmsg.c (from r402606, head/comms/efax/files/patch-efaxmsg.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/comms/efax/files/patch-efaxmsg.c Sun Nov 29 16:56:05 2015 (r402607, copy of r402606, head/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 ; + } + Copied: branches/2015Q4/comms/efax/files/patch-fax (from r402606, head/comms/efax/files/patch-fax) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/comms/efax/files/patch-fax Sun Nov 29 16:56:05 2015 (r402607, copy of r402606, head/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).
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511291656.tATGu6Za055386>