cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

respect ${CC} and rename patches

Browse Source
This commit is contained in:
lebel 2002-07-17 22:45:09 +00:00
parent 767d29bc54
commit 6216ec7ad7
8 changed files with 151 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
comms/efax/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.15 2002/03/21 20:46:23 espie Exp $
# $OpenBSD: Makefile,v 1.16 2002/07/17 22:45:09 lebel Exp $
COMMENT= "small & simple FAX send/receive program"
DISTNAME= efax-0.9
PKGNAME= efax-0.9
CATEGORIES= comms
NEED_VERSION= 1.515
MAINTAINER= Ian Darwin <ian@openbsd.org>
@ -19,6 +18,7 @@ MASTER_SITES= ftp://sunsite.unc.edu/pub/Linux/apps/serialcomm/fax/
FAX_UID = uucp
FAX_GID = dialer
MAKE_ENV= CC="${CC}"
FAKE_FLAGS=BINDIR=${WRKINST}${PREFIX}/bin MANDIR=${WRKINST}${PREFIX}/man
# The inner program, efax, must be setuid uucp, same as tip, cu, uucp,
# so it can open the /dev/cua?? files.

37
comms/efax/patches/patch-Makefile Normal file
View File

@ -0,0 +1,37 @@
$OpenBSD: patch-Makefile,v 1.1 2002/07/17 22:45:09 lebel Exp $
--- Makefile.orig Thu Mar 11 20:00:34 1999
+++ Makefile Wed Jul 17 18:25:31 2002
@@ -1,22 +1,17 @@
# Makefile for efax
-# Change the following to the name of your ANSI C compiler
-# (normally gcc).
-
-CC=gcc
-
# Compile/load options. Add -DNO_STRERROR to CFLAGS if _strerror
# is undefined
-CFLAGS=
+CFLAGS=-O2
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=/usr/local/bin
+MANDIR=/usr/local/man
.c.o:
$(CC) $(CFLAGS) -c $<
@@ -25,7 +20,6 @@ all: efax efix
efax: efax.o efaxlib.o efaxio.o efaxos.o efaxmsg.o
$(CC) -o efax $(LDFLAGS) efax.o efaxlib.o efaxio.o efaxos.o efaxmsg.o
- strip efax
efix: efix.o efaxlib.o efaxmsg.o
$(CC) -o efix $(LDFLAGS) efix.o efaxlib.o efaxmsg.o

55
comms/efax/patches/patch-aa
View File

@ -1,55 +0,0 @@
*** Makefile.orig Thu Mar 11 17:00:34 1999
--- Makefile Thu Aug 19 13:44:03 1999
***************
*** 3,22 ****
# Change the following to the name of your ANSI C compiler
# (normally gcc).
! CC=gcc
# 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
.c.o:
$(CC) $(CFLAGS) -c $<
--- 3,22 ----
# Change the following to the name of your ANSI C compiler
# (normally gcc).
! CC=cc
# Compile/load options. Add -DNO_STRERROR to CFLAGS if _strerror
# is undefined
! CFLAGS=-O2
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/local/bin
! MANDIR=/usr/local/man
.c.o:
$(CC) $(CFLAGS) -c $<
***************
*** 25,31 ****
efax: efax.o efaxlib.o efaxio.o efaxos.o efaxmsg.o
$(CC) -o efax $(LDFLAGS) efax.o efaxlib.o efaxio.o efaxos.o efaxmsg.o
- strip efax
efix: efix.o efaxlib.o efaxmsg.o
$(CC) -o efix $(LDFLAGS) efix.o efaxlib.o efaxmsg.o
--- 25,30 ----

168
comms/efax/patches/patch-ab
View File

@ -1,168 +0,0 @@
*** efax.c.orig Sat Mar 27 06:24:10 1999
--- efax.c Thu Aug 19 13:33:41 1999
***************
*** 606,612 ****
if ( ckfmt ( header, 6 ) )
msg ( "W too many %%d escapes in header format string \"%s\"", header ) ;
else
! sprintf ( headerbuf, header, page, pages, page, pages, page, pages ) ;
msg ("I header:[%s]", headerbuf ) ;
done = err = ttymode ( mf, SEND ) ;
--- 606,612 ----
if ( ckfmt ( header, 6 ) )
msg ( "W too many %%d escapes in header format string \"%s\"", header ) ;
else
! snprintf ( headerbuf, sizeof headerbuf, header, page, pages, page, pages, page, pages ) ;
msg ("I header:[%s]", headerbuf ) ;
done = err = ttymode ( mf, SEND ) ;
***************
*** 1658,1664 ****
err = rdpage ( inf, dp, &ppm, local, &changed ) ;
if ( ! err && changed ) {
! sprintf ( buf, c20 ? "+FIS=%d,%d,%d,%d" : "+FDIS=%d,%d,%d,%d",
local[0], local[1], local[2], local[3] ) ;
ckcmd ( mf, 0, buf, TO_FT, OK ) ;
if ( gethsc ( &hsc, &err ) ) {
--- 1658,1665 ----
err = rdpage ( inf, dp, &ppm, local, &changed ) ;
if ( ! err && changed ) {
! snprintf ( buf, sizeof buf,
! c20 ? "+FIS=%d,%d,%d,%d" : "+FDIS=%d,%d,%d,%d",
local[0], local[1], local[2], local[3] ) ;
ckcmd ( mf, 0, buf, TO_FT, OK ) ;
if ( gethsc ( &hsc, &err ) ) {
***************
*** 1816,1822 ****
int err=0, hsc=-1 ;
char c, dsbuf [ 128 ], *p ;
! sprintf ( dsbuf, nowait ? "D%.126s;" : "D%.127s" , s ) ;
msg ( "Idialing %s", dsbuf+1 ) ;
c = cmd ( f, dsbuf, TO_A ) ;
--- 1817,1823 ----
int err=0, hsc=-1 ;
char c, dsbuf [ 128 ], *p ;
! snprintf ( dsbuf, sizeof dsbuf, nowait ? "D%.126s;" : "D%.127s" , s ) ;
msg ( "Idialing %s", dsbuf+1 ) ;
c = cmd ( f, dsbuf, TO_A ) ;
***************
*** 1944,1950 ****
if ( ckfmt ( getty, 6 ) ) {
err = msg ( "E3 too many %%d escapes in command (%s)", getty ) ;
} else {
! sprintf ( buf, getty, crate, crate, crate, crate, crate, crate ) ;
msg ( "Iexec'ing /bin/sh -c \"%s\"" , buf ) ;
execl ( "/bin/sh" , "sh" , "-c" , buf , (void*) 0 ) ;
err = msg ( "ES2exec failed:" ) ;
--- 1945,1951 ----
if ( ckfmt ( getty, 6 ) ) {
err = msg ( "E3 too many %%d escapes in command (%s)", getty ) ;
} else {
! snprintf ( buf, sizeof buf, getty, crate, crate, crate, crate, crate, crate ) ;
msg ( "Iexec'ing /bin/sh -c \"%s\"" , buf ) ;
execl ( "/bin/sh" , "sh" , "-c" , buf , (void*) 0 ) ;
err = msg ( "ES2exec failed:" ) ;
***************
*** 1963,1969 ****
char buf [ MAXGETTY ] ;
if ( ckfmt ( vcmd, 6 ) ) {
} else {
! sprintf ( buf, vcmd, f->fd, f->fd, f->fd, f->fd, f->fd, f->fd ) ;
msg ( "Iexec'ing /bin/sh -c \"%s\"" , buf ) ;
execl ( "/bin/sh" , "sh" , "-c" , buf , (void*) 0 ) ;
err = msg ( "ES2exec failed:" ) ;
--- 1964,1970 ----
char buf [ MAXGETTY ] ;
if ( ckfmt ( vcmd, 6 ) ) {
} else {
! snprintf ( buf, sizeof buf, vcmd, f->fd, f->fd, f->fd, f->fd, f->fd, f->fd ) ;
msg ( "Iexec'ing /bin/sh -c \"%s\"" , buf ) ;
execl ( "/bin/sh" , "sh" , "-c" , buf , (void*) 0 ) ;
err = msg ( "ES2exec failed:" ) ;
***************
*** 2090,2102 ****
}
if ( capsset ) {
! sprintf ( buf, c20 ? "+FCC=%d,%d,%d,%d,%d,%d,%d,%d" :
"+FDCC=%d,%d,%d,%d,%d,%d,%d,%d",
c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7] ) ;
ckcmd ( mf, 0, buf, -t, OK ) ;
}
! sprintf ( buf, c20 ? "+FLI=\"%.*s\"" : "+FLID=\"%.*s\"" ,
CMDBUFSIZE-9, id ) ;
ckcmd ( mf, 0, buf, -t, OK ) ;
--- 2091,2103 ----
}
if ( capsset ) {
! snprintf ( buf, sizeof buf, c20 ? "+FCC=%d,%d,%d,%d,%d,%d,%d,%d" :
"+FDCC=%d,%d,%d,%d,%d,%d,%d,%d",
c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7] ) ;
ckcmd ( mf, 0, buf, -t, OK ) ;
}
! snprintf ( buf, sizeof buf, c20 ? "+FLI=\"%.*s\"" : "+FLID=\"%.*s\"" ,
CMDBUFSIZE-9, id ) ;
ckcmd ( mf, 0, buf, -t, OK ) ;
***************
*** 2104,2110 ****
ckcmd ( mf, 0, c20 ? "+FSP=1" : "+FSPL=1", -t, OK ) ;
! sprintf ( buf, c20 ? "+FPI=\"%.*s\"" : "+FCIG=\"%.*s\"" ,
CMDBUFSIZE-9, id ) ;
ckcmd ( mf, 0, buf, -t, OK ) ;
--- 2105,2111 ----
ckcmd ( mf, 0, c20 ? "+FSP=1" : "+FSPL=1", -t, OK ) ;
! snprintf(buf, sizeof buf, c20 ? "+FPI=\"%.*s\"" : "+FCIG=\"%.*s\"" ,
CMDBUFSIZE-9, id ) ;
ckcmd ( mf, 0, buf, -t, OK ) ;
***************
*** 2209,2215 ****
msg("Wlocal ID (%s) truncated to %d characters", nxtoptarg, IDLEN ) ;
if ( strspn ( nxtoptarg, " +0123456789" ) != strlen ( nxtoptarg ) )
msg("Wlocal ID (%s) has non-standard characters", nxtoptarg ) ;
! sprintf ( localid, "%*.*s", IDLEN, IDLEN, nxtoptarg ) ;
break ;
case 'i':
if ( nicmd[0] < MAXICMD ) icmd[0][ nicmd[0]++ ] = nxtoptarg ;
--- 2210,2216 ----
msg("Wlocal ID (%s) truncated to %d characters", nxtoptarg, IDLEN ) ;
if ( strspn ( nxtoptarg, " +0123456789" ) != strlen ( nxtoptarg ) )
msg("Wlocal ID (%s) has non-standard characters", nxtoptarg ) ;
! snprintf ( localid, sizeof localid, "%*.*s", IDLEN, IDLEN, nxtoptarg ) ;
break ;
case 'i':
if ( nicmd[0] < MAXICMD ) icmd[0][ nicmd[0]++ ] = nxtoptarg ;
***************
*** 2307,2313 ****
char tmp [ MAXLINELEN ] ;
now = time ( 0 ) ;
strftime ( tmp, MAXLINELEN, "%c %%s P. %%%%d", localtime ( &now ) ) ;
! sprintf ( header = headerbuf, tmp, localid ) ;
}
if ( ! err ) {
--- 2308,2314 ----
char tmp [ MAXLINELEN ] ;
now = time ( 0 ) ;
strftime ( tmp, MAXLINELEN, "%c %%s P. %%%%d", localtime ( &now ) ) ;
! snprintf ( header = headerbuf, sizeof headerbuf, tmp, localid ) ;
}
if ( ! err ) {

19
comms/efax/patches/patch-ac
View File

@ -1,19 +0,0 @@
*** efaxio.c.orig Mon Mar 1 22:15:44 1999
--- efaxio.c Thu Aug 19 13:36:30 1999
***************
*** 246,252 ****
if ( strlen(s) >= CMDBUFSIZE-4 ) {
msg ( "E modem command \"%s\" too long", s ) ;
} else {
! sprintf ( buf, "AT%s\r", s ) ;
tput ( f, buf, strlen(buf) ) ;
}
}
--- 246,252 ----
if ( strlen(s) >= CMDBUFSIZE-4 ) {
msg ( "E modem command \"%s\" too long", s ) ;
} else {
! snprintf ( buf, sizeof buf, "AT%s\r", s ) ;
tput ( f, buf, strlen(buf) ) ;
}
}

92
comms/efax/patches/patch-efax_c Normal file
View File

@ -0,0 +1,92 @@
$OpenBSD: patch-efax_c,v 1.1 2002/07/17 22:45:09 lebel Exp $
--- efax.c.orig Sat Mar 27 09:24:10 1999
+++ efax.c Wed Jul 17 18:25:19 2002
@@ -606,7 +606,7 @@ int send_data ( TFILE *mf, IFILE *f, int
if ( ckfmt ( header, 6 ) )
msg ( "W too many %%d escapes in header format string \"%s\"", header ) ;
else
- sprintf ( headerbuf, header, page, pages, page, pages, page, pages ) ;
+ snprintf ( headerbuf, sizeof headerbuf, header, page, pages, page, pages, page, pages ) ;
msg ("I header:[%s]", headerbuf ) ;
done = err = ttymode ( mf, SEND ) ;
@@ -1658,7 +1658,8 @@ int c2sndrcv (
err = rdpage ( inf, dp, &ppm, local, &changed ) ;
if ( ! err && changed ) {
- sprintf ( buf, c20 ? "+FIS=%d,%d,%d,%d" : "+FDIS=%d,%d,%d,%d",
+ snprintf ( buf, sizeof buf,
+ c20 ? "+FIS=%d,%d,%d,%d" : "+FDIS=%d,%d,%d,%d",
local[0], local[1], local[2], local[3] ) ;
ckcmd ( mf, 0, buf, TO_FT, OK ) ;
if ( gethsc ( &hsc, &err ) ) {
@@ -1816,7 +1817,7 @@ int dial ( TFILE *f, char *s, int nowait
int err=0, hsc=-1 ;
char c, dsbuf [ 128 ], *p ;
- sprintf ( dsbuf, nowait ? "D%.126s;" : "D%.127s" , s ) ;
+ snprintf ( dsbuf, sizeof dsbuf, nowait ? "D%.126s;" : "D%.127s" , s ) ;
msg ( "Idialing %s", dsbuf+1 ) ;
c = cmd ( f, dsbuf, TO_A ) ;
@@ -1944,7 +1945,7 @@ int answer ( TFILE *f, char **lkfile,
if ( ckfmt ( getty, 6 ) ) {
err = msg ( "E3 too many %%d escapes in command (%s)", getty ) ;
} else {
- sprintf ( buf, getty, crate, crate, crate, crate, crate, crate ) ;
+ snprintf ( buf, sizeof buf, getty, crate, crate, crate, crate, crate, crate ) ;
msg ( "Iexec'ing /bin/sh -c \"%s\"" , buf ) ;
execl ( "/bin/sh" , "sh" , "-c" , buf , (void*) 0 ) ;
err = msg ( "ES2exec failed:" ) ;
@@ -1963,7 +1964,7 @@ int answer ( TFILE *f, char **lkfile,
char buf [ MAXGETTY ] ;
if ( ckfmt ( vcmd, 6 ) ) {
} else {
- sprintf ( buf, vcmd, f->fd, f->fd, f->fd, f->fd, f->fd, f->fd ) ;
+ snprintf ( buf, sizeof buf, vcmd, f->fd, f->fd, f->fd, f->fd, f->fd, f->fd ) ;
msg ( "Iexec'ing /bin/sh -c \"%s\"" , buf ) ;
execl ( "/bin/sh" , "sh" , "-c" , buf , (void*) 0 ) ;
err = msg ( "ES2exec failed:" ) ;
@@ -2090,13 +2091,13 @@ int modem_init ( TFILE *mf, cap c, char
}
if ( capsset ) {
- sprintf ( buf, c20 ? "+FCC=%d,%d,%d,%d,%d,%d,%d,%d" :
+ snprintf ( buf, sizeof buf, c20 ? "+FCC=%d,%d,%d,%d,%d,%d,%d,%d" :
"+FDCC=%d,%d,%d,%d,%d,%d,%d,%d",
c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7] ) ;
ckcmd ( mf, 0, buf, -t, OK ) ;
}
- sprintf ( buf, c20 ? "+FLI=\"%.*s\"" : "+FLID=\"%.*s\"" ,
+ snprintf ( buf, sizeof buf, c20 ? "+FLI=\"%.*s\"" : "+FLID=\"%.*s\"" ,
CMDBUFSIZE-9, id ) ;
ckcmd ( mf, 0, buf, -t, OK ) ;
@@ -2104,7 +2105,7 @@ int modem_init ( TFILE *mf, cap c, char
ckcmd ( mf, 0, c20 ? "+FSP=1" : "+FSPL=1", -t, OK ) ;
- sprintf ( buf, c20 ? "+FPI=\"%.*s\"" : "+FCIG=\"%.*s\"" ,
+ snprintf(buf, sizeof buf, c20 ? "+FPI=\"%.*s\"" : "+FCIG=\"%.*s\"" ,
CMDBUFSIZE-9, id ) ;
ckcmd ( mf, 0, buf, -t, OK ) ;
@@ -2209,7 +2210,7 @@ int main( int argc, char **argv)
msg("Wlocal ID (%s) truncated to %d characters", nxtoptarg, IDLEN ) ;
if ( strspn ( nxtoptarg, " +0123456789" ) != strlen ( nxtoptarg ) )
msg("Wlocal ID (%s) has non-standard characters", nxtoptarg ) ;
- sprintf ( localid, "%*.*s", IDLEN, IDLEN, nxtoptarg ) ;
+ snprintf ( localid, sizeof localid, "%*.*s", IDLEN, IDLEN, nxtoptarg ) ;
break ;
case 'i':
if ( nicmd[0] < MAXICMD ) icmd[0][ nicmd[0]++ ] = nxtoptarg ;
@@ -2307,7 +2308,7 @@ int main( int argc, char **argv)
char tmp [ MAXLINELEN ] ;
now = time ( 0 ) ;
strftime ( tmp, MAXLINELEN, "%c %%s P. %%%%d", localtime ( &now ) ) ;
- sprintf ( header = headerbuf, tmp, localid ) ;
+ snprintf ( header = headerbuf, sizeof headerbuf, tmp, localid ) ;
}
if ( ! err ) {

12
comms/efax/patches/patch-efaxio_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-efaxio_c,v 1.1 2002/07/17 22:45:09 lebel Exp $
--- efaxio.c.orig Tue Mar 2 01:15:44 1999
+++ efaxio.c Wed Jul 17 18:25:19 2002
@@ -246,7 +246,7 @@ int cmd ( TFILE *f, char *s, int t )
if ( strlen(s) >= CMDBUFSIZE-4 ) {
msg ( "E modem command \"%s\" too long", s ) ;
} else {
- sprintf ( buf, "AT%s\r", s ) ;
+ snprintf ( buf, sizeof buf, "AT%s\r", s ) ;
tput ( f, buf, strlen(buf) ) ;
}
}

15
comms/efax/patches/patch-ad → comms/efax/patches/patch-fax
View File

@ -1,6 +1,7 @@
--- fax.orig Wed Mar 24 08:07:28 1999
+++ fax Thu Oct 28 22:50:23 1999
@@ -28,16 +28,17 @@
$OpenBSD: patch-fax,v 1.1 2002/07/17 22:45:09 lebel Exp $
--- fax.orig Wed Mar 24 03:07:28 1999
+++ fax Wed Jul 17 18:25:19 2002
@@ -28,16 +28,17 @@ EFIX=efix
# /dev/modem is a link to /dev/cua1, then getty, uucp, kermit,
# pppd, dip, etc. must *all* use either /dev/modem or /dev/cua1.
@ -21,7 +22,7 @@
# The preferred page size for creating and printing faxes.
# Allowed values are "letter", "legal", and "a4".
@@ -81,7 +82,8 @@
@@ -81,7 +82,8 @@ DIALSUFFIX=""
# conventions. Protect with single quotes for delayed evaluation.
# Add a leading '#' to the file name to use binary format.
@ -31,7 +32,7 @@
# 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
@@ -101,6 +103,7 @@
@@ -101,6 +103,7 @@ LOCK='-x /var/lock/LCK..$DEV' # moder
# The remaining options probably won't need to be changed.
# ****************************************************************
@ -39,7 +40,7 @@
# Configuration files that are sourced if they exist. Comment
# out if you don't need to use config files. Warning: any type of
# shell command in these files will be executed.
@@ -404,7 +407,11 @@
@@ -404,7 +407,11 @@ NOLOG='[145]'
# --- End of user configuration section ---
# ****************************************************************
@ -52,7 +53,7 @@
for f in $CONFIGFILES
do
@@ -413,6 +420,15 @@
@@ -413,6 +420,15 @@ do
eval "`cat $f`"
fi
done