- add LICENSE

- default config now PREFIX aware
- make portlint happier
This commit is contained in:
Dirk Meyer 2017-02-09 10:20:41 +00:00
parent 35a76c4c2d
commit 8596ff9eea
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=433719
11 changed files with 94 additions and 102 deletions

View file

@ -2,18 +2,20 @@
PORTNAME= ifmail
PORTVERSION= 2.15
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= news comms
MASTER_SITES= SUNSITE/system/fido
MAINTAINER= dinoex@FreeBSD.org
COMMENT= FidoNet(tm) support package for UN*X platform
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/README
USES= shebangfix
USERS= ifmail
CFLAGS+= -DHAS_STDARG_H -Wall
GID!= id -g
MAKE_ARGS= OWNER=${UID} CC="${CC}" GROUP=${GID} CFLAGS="${CFLAGS}"
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" OWNER=${UID} GROUP=$$(id -g)
LMAN3= parsedate.3
LMAN8= ifmail.8 iftoss.8
@ -44,6 +46,10 @@ SHEBANG_FILES= misc/contrib/a2dbm \
OPTIONS_DEFINE= DOCS EXAMPLES
do-configure:
${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
${WRKSRC}/CONFIG
pre-install:
${MKDIR} ${STAGEDIR}${PREFIX}/libexec/ifmail

View file

@ -1,6 +1,12 @@
--- CONFIG.orig Fri Jul 16 23:26:29 1999
+++ CONFIG Sat Oct 2 22:15:45 1999
@@ -8,14 +8,14 @@
--- CONFIG.orig 1999-07-16 21:26:29 UTC
+++ CONFIG
@@ -3,19 +3,19 @@ COPYRIGHT = "Eugene G. Crosser, 1993-1
VERSION = "2.15"
# Main configuration file. This default may be overwritten by -I key.
-CONFIGFILE = "/etc/ifmail/config"
+CONFIGFILE = "%%PREFIX%%/etc/ifmail/config"
# Debug messages turned on by -x key are written here.
# Some error messages may occationally appear here too.
# This may be changed in the 'config' file.
@ -17,7 +23,7 @@
# Use syslog() facility codes for mail gate, news gate and ifcico.
# Define -DHAS_SYSLOG (see below)
@@ -27,13 +27,13 @@
@@ -27,13 +27,13 @@ NEWSLOG = LOG_LOCAL0
CICOLOG = LOG_LOCAL0
# Directory where UUCP lock files reside.
@ -35,7 +41,7 @@
# News spool directory (to check space only)
#NEWSSPOOL = "/usr/spool/news"
@@ -152,20 +152,20 @@
@@ -152,20 +152,20 @@ NEWSSPOOL = "/var/spool/news"
# system, usually "-DINT32=long -DINT16=short"
# Linux/x86: (remove -DHAS_BSD_SIGNALS if you have libc5 (not glibc2))
@ -68,7 +74,7 @@
# SVR4:
#OPTS = -DHAS_STATVFS -DDONT_HAVE_TM_GMTOFF -DHAS_SETSID -DHAS_NDBM_H \
@@ -222,7 +222,7 @@
@@ -222,7 +222,7 @@ OPTS = -DHAS_STATFS -DSTATFS_IN_V
# -DNEED_BSY -DSLAVE_SENDS_NAK_TOO -DINT32=int -DINT16=short
# for make install, where to put binaries and what owner to set
@ -77,7 +83,7 @@
OWNER = ifmail
GROUP = uucp
MODE = 0711
@@ -242,7 +242,7 @@
@@ -242,7 +242,7 @@ AWK = awk
TAR = tar
#CFLAGS = -g -Wall
@ -86,7 +92,7 @@
CFLAGS = -g -O2 -Wall
# SVR4:
#CFLAGS = -O -Xa
@@ -261,7 +261,7 @@
@@ -261,7 +261,7 @@ LDFLAGS =
# Linux w/libc5
#LIBS = -lgdbm
# Linux w/glibc
@ -95,7 +101,7 @@
# SunOS:
#LIBS =
# Solaris:
@@ -276,6 +276,9 @@
@@ -276,6 +276,9 @@ LIBS = -lndbm
#LIBS = -lcposix -lmalloc -ldbm -linet -lPW
# NeXTSTEP
#LIBS = -lgdbm -lposix

View file

@ -1,6 +1,6 @@
--- iflib/clibrary.h.orig Sat Sep 11 17:16:11 1993
+++ iflib/clibrary.h Mon Jul 22 19:38:20 2002
@@ -102,9 +102,11 @@
--- iflib/clibrary.h.orig 1993-09-11 15:16:11 UTC
+++ iflib/clibrary.h
@@ -102,9 +102,11 @@ extern unsigned long inet_addr();
extern FREEVAL free();
extern POINTER malloc();
extern POINTER realloc();
@ -12,7 +12,7 @@
/* Some backward systems need this. */
extern FILE *popen();
@@ -121,8 +123,10 @@
@@ -121,8 +123,10 @@ extern int alarm();
extern void exit();
/* =()<extern @<GETPIDVAL>@ getpid();>()= */
extern int getpid();

View file

@ -1,29 +1,19 @@
*** iflib/config.h.orig Sat Apr 26 04:56:16 1997
--- iflib/config.h Sun Jun 20 12:52:23 1999
***************
*** 1,6 ****
--- 1,7 ----
#ifndef _CONFIG_H
#define _CONFIG_H
+ #include <sys/types.h>
#include "ftn.h"
#ifndef AREA_LIST_TYPE
***************
*** 53,59 ****
extern area_list *badgroups;
extern long configverbose;
! extern long configtime;
extern long maxfsize;
extern long maxpsize;
extern long maxmsize;
--- 54,60 ----
extern area_list *badgroups;
extern long configverbose;
! extern time_t configtime;
extern long maxfsize;
extern long maxpsize;
extern long maxmsize;
--- iflib/config.h.orig 1997-04-26 09:56:16 UTC
+++ iflib/config.h
@@ -1,6 +1,7 @@
#ifndef _CONFIG_H
#define _CONFIG_H
+#include <sys/types.h>
#include "ftn.h"
#ifndef AREA_LIST_TYPE
@@ -53,7 +54,7 @@ extern modem_string *options;
extern area_list *badgroups;
extern long configverbose;
-extern long configtime;
+extern time_t configtime;
extern long maxfsize;
extern long maxpsize;
extern long maxmsize;

View file

@ -1,5 +1,5 @@
--- iflib/directory.h.orig Sat Nov 15 16:22:07 1997
+++ iflib/directory.h Sat Nov 15 16:22:17 1997
--- iflib/directory.h.orig 1994-11-11 21:44:05 UTC
+++ iflib/directory.h
@@ -8,6 +8,7 @@
* Written by stefan@space.s-link.de (Stefan Westerfeld)
*/

View file

@ -1,5 +1,5 @@
--- ifcico/flaglex.l.orig 1995-03-04 10:56:34.000000000 +0100
+++ ifcico/flaglex.l 2013-05-27 15:29:03.783061252 +0200
--- ifcico/flaglex.l.orig 1995-03-04 09:56:34 UTC
+++ ifcico/flaglex.l
@@ -1,3 +1,4 @@
+%option noyywrap
%{

View file

@ -1,5 +1,5 @@
--- iflib/lutil.c.orig Sun Feb 1 23:11:53 1998
+++ iflib/lutil.c Mon Aug 11 17:29:35 2003
--- iflib/lutil.c.orig 1998-02-01 22:11:53 UTC
+++ iflib/lutil.c
@@ -4,7 +4,11 @@
#include <stdio.h>
#include <sys/stat.h>
@ -12,7 +12,7 @@
#include <errno.h>
#include <time.h>
#ifdef HAS_SYSLOG
@@ -126,17 +130,27 @@
@@ -126,17 +130,27 @@ char c;
syslog(level,"\terrno=%d : %s",\
errno,strerror(errno));
@ -40,7 +40,7 @@
if (verbose)
{
PRINT_DEBUG(fmt,args);
@@ -166,17 +180,27 @@
@@ -166,17 +180,27 @@ va_dcl
return;
}
@ -68,7 +68,7 @@
if (verbose)
{
PRINT_DEBUG(fmt,args);
@@ -206,16 +230,26 @@
@@ -206,16 +230,26 @@ va_dcl
return;
}

View file

@ -1,6 +1,6 @@
--- ifcico/nodelist.c.orig Sat Oct 4 11:21:44 1997
+++ ifcico/nodelist.c Mon Jul 16 20:24:13 2001
@@ -207,7 +207,7 @@
--- ifcico/nodelist.c.orig 1997-10-04 09:21:44 UTC
+++ ifcico/nodelist.c
@@ -207,7 +207,7 @@ faddr *addr;
debug(20,"getnlent: phone %s",nodebuf.phone);
debug(20,"getnlent: speed %u",nodebuf.speed);
debug(20,"getnlent: flags 0x%lx",nodebuf.flags);
@ -9,8 +9,8 @@
debug(20,"getnlent: uflag %s",nodebuf.uflags[j]);
return &nodebuf;
--- ifcico/nodelist.h.orig Sat Oct 29 12:19:33 1994
+++ ifcico/nodelist.h Sun Jul 1 10:57:18 2001
--- ifcico/nodelist.h.orig 1994-10-29 11:19:33 UTC
+++ ifcico/nodelist.h
@@ -3,7 +3,7 @@
#include "ftn.h"

View file

@ -1,36 +1,26 @@
*** iflib/rdconfig.c.orig Tue Oct 19 11:27:29 2004
--- iflib/rdconfig.c Tue Oct 19 11:29:47 2004
***************
*** 5,10 ****
--- 5,11 ----
#include <sys/types.h>
#include <sys/stat.h>
#include <time.h>
+ #include <unistd.h>
#include "xutil.h"
#include "lutil.h"
#include "ftn.h"
***************
*** 402,409 ****
verbose=setverbose(arg);
break;
! case 'I': configname=arg;
! break;
default: return 1; /* unrecognized option */
--- 403,415 ----
verbose=setverbose(arg);
break;
! case 'I':
! if (issetugid())
! fprintf(stderr,
! "readconfig: -I option ignored while running as set-user-ID\n");
! else
! configname=arg;
! break;
default: return 1; /* unrecognized option */
--- iflib/rdconfig.c.orig 1997-04-26 09:46:24 UTC
+++ iflib/rdconfig.c
@@ -5,6 +5,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <time.h>
+#include <unistd.h>
#include "xutil.h"
#include "lutil.h"
#include "ftn.h"
@@ -402,8 +403,13 @@ char *arg;
verbose=setverbose(arg);
break;
- case 'I': configname=arg;
- break;
+ case 'I':
+ if (issetugid())
+ fprintf(stderr,
+ "readconfig: -I option ignored while running as set-user-ID\n");
+ else
+ configname=arg;
+ break;
default: return 1; /* unrecognized option */

View file

@ -1,6 +1,6 @@
--- ifcico/respfreq.c.orig Sun Jul 13 01:38:51 1997
+++ ifcico/respfreq.c Mon Aug 11 17:34:09 2003
@@ -17,7 +17,11 @@
--- ifcico/respfreq.c.orig 1997-07-12 23:38:51 UTC
+++ ifcico/respfreq.c
@@ -17,7 +17,11 @@ int re_exec(char*);
#include "lutil.h"
#include "config.h"
#ifndef NOFREQREPORT
@ -12,7 +12,7 @@
#include "ftnmsg.h"
#endif
#include "version.h"
@@ -43,7 +47,7 @@
@@ -43,7 +47,7 @@ static file_list *resplist(char*);
#ifndef NOFREQREPORT
static void attach_report(file_list**);
@ -21,7 +21,7 @@
static char *report_text=NULL;
static unsigned long report_total=0L;
#endif
@@ -519,15 +523,25 @@
@@ -519,15 +523,25 @@ file_list **fl;
report_text=NULL;
}

View file

@ -154,5 +154,5 @@ libexec/ifmail/nlpatch
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zmailer/routes
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zmailer/scheduler.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zmailer/sm.conf
@exec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^ifcico /etc/services.bak ; echo "ifcico 60179/tcp #ifcico server (ifmail)") > /etc/services
@unexec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^ifcico /etc/services.bak ) > /etc/services
@preexec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^ifcico /etc/services.bak ; echo "ifcico 60179/tcp #ifcico server (ifmail)") > /etc/services
@postunexec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^ifcico /etc/services.bak ) > /etc/services