File procmail-3.22.dif of Package procmail
--- .pkgextract
+++ .pkgextract Mon Feb 23 14:01:47 2004
@@ -0,0 +1 @@
+patch -p0 -s --suffix=.mailstat < ../procmail-3.22-mailstat.patch
--- Makefile
+++ Makefile Mon Feb 23 14:01:47 2004
@@ -53,7 +53,7 @@
# Makefile.0 - mark, don't (re)move this, a sed script needs it
-LOCKINGTEST=__defaults__
+#LOCKINGTEST=__defaults__
#LOCKINGTEST=/tmp . # Uncomment and add any directories you see fit.
# If LOCKINGTEST is defined, autoconf will NOT
@@ -66,6 +66,7 @@
########################################################################
#LOCKINGTEST=100 # Uncomment (and change) if you think you know
+LOCKINGTEST=100
# it better than the autoconf lockingtests.
# This will cause the lockingtests to be hotwired.
# 100 to enable fcntl()
@@ -74,19 +75,20 @@
# Or them together to get the desired combination.
# Optional system libraries we search for
-SEARCHLIBS = -lm -ldir -lx -lsocket -lnet -linet -lnsl_s -lnsl_i -lnsl -lsun \
- -lgen -lsockdns -ldl
+# SEARCHLIBS = -lm -ldir -lx -lsocket -lnet -linet -lnsl_s -lnsl_i -lnsl -lsun \
+# -lgen -lsockdns -ldl
+SEARCHLIBS = -lm
# -lresolv # not really needed, is it?
# Informal list of directories where we look for the libraries in SEARCHLIBS
-LIBPATHS=/lib /usr/lib /usr/local/lib
+LIBPATHS=/lib /usr/lib
-GCC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat -Wtraditional \
+GCC_WARNINGS = -pedantic -Wreturn-type -Wunused -Wformat -Wtraditional \
-Wpointer-arith -Wconversion -Waggregate-return \
#-Wimplicit -Wshadow -Wid-clash-6 #-Wuninitialized
# The place to put your favourite extra cc flag
-CFLAGS0 = -O #$(GCC_WARNINGS)
+CFLAGS0 = $(RPM_OPT_FLAGS) -D_GNU_SOURCE -pipe #$(GCC_WARNINGS)
LDFLAGS0= -s
# Read my libs :-)
LIBS=
@@ -95,6 +97,7 @@
LDFLAGS1= $(LDFLAGS0) $(LIBS) #-lcposix
####CC = cc # gcc
+CC = gcc
# object file extension
O = o
RM = /bin/rm -f
@@ -108,7 +111,7 @@
SUBDIRS = src man
BINSS = procmail lockfile formail mailstat
-MANS1S = procmail formail lockfile
+MANS1S = procmail formail lockfile mailstat
MANS5S = procmailrc procmailsc procmailex
# Possible locations for the sendmail.cf file
--- config.h
+++ config.h Mon Feb 23 14:06:29 2004
@@ -1,7 +1,7 @@
/*$Id: config.h,v 1.101 2001/08/27 08:43:57 guenther Exp $*/
-/*#define sMAILBOX_SEPARATOR "\1\1\1\1\n" /* sTART- and eNDing separ. */
-/*#define eMAILBOX_SEPARATOR "\1\1\1\1\n" /* uncomment (one or both)
+/*#define sMAILBOX_SEPARATOR "\1\1\1\1\n"*/ /* StarT- and eNDing separ. */
+/*#define eMAILBOX_SEPARATOR "\1\1\1\1\n"*/ /* uncomment (one or both)
if your mail system uses
nonstandard mail separators (non sendmail or smail compatible mailers
like MMDF), if yours is even different, uncomment and change the
@@ -33,8 +33,10 @@
* override those settings you should uncomment and possibly change the
* DEFSPATH and DEFPATH defines below
*/
-/*#define DEFSPATH "PATH=/bin:/usr/bin" /* */
-/*#define DEFPATH "PATH=$HOME/bin:/bin:/usr/bin" /* */
+/*#define DEFSPATH "PATH=/bin:/usr/bin" */ /* */
+/*#define DEFPATH "PATH=$HOME/bin:/bin:/usr/bin" */ /* */
+
+#define DEFPATH "PATH=$HOME/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin/X11"
/* every environment variable appearing in PRESTENV will be set or wiped
* out of the environment (variables without an '=' sign will be thrown
@@ -46,13 +48,13 @@
*/
#define PRESTENV {"IFS","ENV","PWD",0}
-/*#define GROUP_PER_USER /* uncomment this if each
+/*#define GROUP_PER_USER */ /* uncomment this if each
user has his or her own
group and procmail can therefore trust a $HOME/.procmailrc that
is group writable or contained in a group writable home directory
if the group involved is the user's default group. */
-/*#define LMTP /* uncomment this if you
+/*#define LMTP */ /* uncomment this if you
want to use procmail
as an LMTP (rfc2033) server, presumably for invocation by an MTA.
The file examples/local_procmail_lmtp.m4 contains info on how to
@@ -75,30 +77,30 @@
>From_ field will be added in the header */
#define TRUSTED_IDS {"root","daemon","uucp","mail","x400","network",\
- "list","slist","lists","news",0}
+ "list","slist","lists","news","mdom",0}
-/*#define NO_fcntl_LOCK /* uncomment any of these three if you */
-/*#define NO_lockf_LOCK /* definitely do not want procmail to make */
-/*#define NO_flock_LOCK /* use of those kernel-locking methods */
+/*#define NO_fcntl_LOCK */ /* uncomment any of these three if you */
+/*#define NO_lockf_LOCK */ /* definitely do not want procmail to make */
+/*#define NO_flock_LOCK */ /* use of those kernel-locking methods */
/* If you set LOCKINGTEST to a binary number
than there's no need to set these. These #defines are only useful
if you want to disable particular locking styles but are unsure which
of the others are safe. Otherwise, don't touch them. */
-/*#define RESTRICT_EXEC 100 /* uncomment to prevent users with uids equal
+/*#define RESTRICT_EXEC 100*/ /* uncomment to prevent users with uids equal
or higher than RESTRICT_EXEC from
executing programs from within their .procmailrc files (this
restriction does not apply to the /etc/procmailrc and
/etc/procmailrcs files) */
-/*#define NO_NFS_ATIME_HACK /* uncomment if you're definitely not using
+/*#define NO_NFS_ATIME_HACK*/ /* uncomment if you're definitely not using
NFS mounted filesystems and can't afford
procmail to sleep for 1 sec. before writing to an empty regular
mailbox. This lets programs correctly judge whether there is unread
mail present. procmail automatically suppresses this when it isn't
needed or under heavy load. */
-/*#define DEFsendmail "/usr/sbin/sendmail" /* uncomment and/or change if
+/*#define DEFsendmail "/usr/sbin/sendmail"*/ /* uncomment and/or change if
the autoconfigured default
SENDMAIL is not suitable. This program should quack like a sendmail:
it should accept the -oi flag (to tell it to _not_ treat a line
@@ -126,7 +128,7 @@
called with the -m option, without variable assignments on the command
line). */
-/*#define console "/dev/console" /* uncomment if you want procmail to
+/*#define console "/dev/console"*/ /* uncomment if you want procmail to
use the console (or any other
terminal or file) to print any error messages that could not be dumped
in the "logfile"; only recommended for debugging purposes, if you have
--- src/fields.c
+++ src/fields.c Mon Feb 23 14:01:47 2004
@@ -110,16 +110,16 @@
/* try and append one valid field to rdheader from stdin */
int readhead P((void))
{ int idlen;
- getline();
+ pm_getline();
if((idlen=breakfield(buf,buffilled))<=0) /* not the start of a valid field */
return 0;
if(idlen==STRLEN(FROM)&&eqFrom_(buf)) /* it's a From_ line */
{ if(rdheader)
return 0; /* the From_ line was a fake! */
- for(;buflast=='>';getline()); /* gather continued >From_ lines */
+ for(;buflast=='>';pm_getline()); /* gather continued >From_ lines */
}
else
- for(;;getline()) /* get the rest of the continued field */
+ for(;;pm_getline()) /* get the rest of the continued field */
{ switch(buflast) /* will this line be continued? */
{ case ' ':case '\t': /* yep, it sure is */
continue;
--- src/formail.c
+++ src/formail.c Mon Feb 23 14:01:47 2004
@@ -819,7 +819,7 @@
{ if(split) /* gobble up the next start separator */
{ buffilled=0;
#ifdef sMAILBOX_SEPARATOR
- getline();buffilled=0; /* but only if it's defined */
+ pm_getline();buffilled=0; /* but only if it's defined */
#endif
if(buflast!=EOF) /* if any */
goto splitit;
--- src/formisc.c
+++ src/formisc.c Mon Feb 23 14:01:47 2004
@@ -115,7 +115,7 @@
buf[buffilled++]=c;
}
-int getline P((void)) /* read a newline-terminated line */
+int pm_getline P((void)) /* read a newline-terminated line */
{ if(buflast==EOF) /* at the end of our Latin already? */
{ loadchar('\n'); /* fake empty line */
return EOF; /* spread the word */
--- src/formisc.h
+++ src/formisc.h Mon Feb 23 14:01:47 2004
@@ -17,4 +17,4 @@
char*
skipwords P((char*start));
int
- getline P((void));
+ pm_getline P((void));
--- src/includes.h
+++ src/includes.h Mon Feb 23 14:07:56 2004
@@ -26,7 +26,7 @@
#endif
#ifndef UNISTD_H_MISSING
#include <unistd.h> /* open() read() write() close() dup() pipe()
- /* fork() getuid() geteuid() getgid() getegid()
+ fork() getuid() geteuid() getgid() getegid()
getpid() execv() execvp() sleep() setuid()
setgid() setruid() setrgid() setegid()
chown() nice() ftruncate() truncate() */
@@ -35,7 +35,7 @@
#undef UNISTD_H_MISSING
#endif
#include <stdio.h> /* setbuf() fclose() stdin stdout stderr
- /* fopen() fread() fwrite() fgetc() getc()
+ fopen() fread() fwrite() fgetc() getc()
getchar() fdopen() putc() fputs() printf()
sprintf() fprintf() sscanf() FILE EOF
fileno() */
@@ -46,20 +46,20 @@
#endif
#ifndef STDLIB_H_MISSING
#include <stdlib.h> /* getenv() malloc() realloc() free()
- /* strtol() strtod() exit() EXIT_SUCCESS */
+ strtol() strtod() exit() EXIT_SUCCESS */
#endif
#include <time.h> /* time() ctime() time_t */
#include <fcntl.h> /* fcntl() struct flock O_RDONLY O_WRONLY
- /* O_APPEND O_CREAT O_EXCL */
+ O_APPEND O_CREAT O_EXCL */
#include <grp.h> /* getgrgid() struct group */
#include <pwd.h> /* getpwuid() getpwnam() struct passwd */
#ifndef DIRENT_H_MISSING
#include <dirent.h> /* opendir() readdir() closedir() DIR
- /* struct dirent */
+ struct dirent */
#endif
#ifndef SYS_WAIT_H_MISSING
#include <sys/wait.h> /* wait() waitpid() WIFEXITED() WIFSTOPPED()
- /* WEXITSTATUS() WTERMSIG() WNOHANG */
+ WEXITSTATUS() WTERMSIG() WNOHANG */
#else
#undef SYS_WAIT_H_MISSING
#endif
@@ -67,12 +67,12 @@
#include <sys/utsname.h> /* uname() utsname */
#endif
#include <sys/stat.h> /* stat() S_ISDIR() S_ISREG() struct stat
- /* chmod() mkdir() */
+ chmod() mkdir() */
#include <signal.h> /* signal() kill() alarm() SIG_IGN SIGHUP
- /* SIGINT SIGQUIT SIGALRM SIGTERM */
+ SIGINT SIGQUIT SIGALRM SIGTERM */
#ifndef STRING_H_MISSING
#include <string.h> /* strcpy() strcat() strlen()
- /* strspn() strcspn() strchr() strcmp()
+ strspn() strcspn() strchr() strcmp()
strncmp() strpbrk() strstr() memmove()
strncasecmp() memset() */
#endif
@@ -81,7 +81,7 @@
#endif
#ifndef SYSLOG_H_MISSING
#include <syslog.h> /* openlog() syslog() closelog() LOG_EMERG
- /* LOG_ALERT LOG_CRIT LOG_ERR LOG_NOTICE
+ LOG_ALERT LOG_CRIT LOG_ERR LOG_NOTICE
LOG_PID LOG_MAIL */
#endif
#include <errno.h> /* EINTR EEXIST ENFILE EACCES EAGAIN EXDEV */
@@ -118,7 +118,7 @@
#ifndef SYS_DIRENT_H_MISSING /* sys/dirent.h must be moved down here */
#include <sys/dirent.h>
#else
-/*#undef SYS_DIRENT_H_MISSING /* needed by autoconf */
+/*#undef SYS_DIRENT_H_MISSING */ /* needed by autoconf */
/* I give up, I can only hope that your system defines DIR and struct dirent */
#endif
#endif
