Search
j0ke.net Open Build Service
>
Projects
>
oldschool
>
procmail
> procmail-3.22.dif
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File procmail-3.22.dif of Package procmail
--- .pkgextract +++ .pkgextract Tue Jan 9 17:18:22 2001 @@ -0,0 +1 @@ +patch -p0 -s --suffix=.maildir < ../procmail-3.15-maildir.patch --- Makefile +++ Makefile Tue Jan 9 17:18:22 2001 @@ -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=001 # 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 -D__USE_STRING_INLINES -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 @@ -107,7 +110,7 @@ SUBDIRS = src man BINSS = procmail lockfile formail mailstat -MANS1S = procmail formail lockfile +MANS1S = procmail formail lockfile MANS5S = procmailrc procmailsc procmailex # Makefile - mark, don't (re)move this, a sed script needs it --- config.h +++ config.h Tue Jan 9 17:18:22 2001 @@ -36,6 +36,8 @@ /*#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 * out), e.g. you could define PRESTENV as follows: @@ -63,7 +65,7 @@ >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 */ --- src/fields.c +++ src/fields.c Tue Jan 9 17:19:26 2001 @@ -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 Tue Jan 9 17:18:22 2001 @@ -818,7 +818,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 Tue Jan 9 17:18:22 2001 @@ -114,7 +114,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 Tue Jan 9 17:18:22 2001 @@ -17,4 +17,4 @@ char* skipwords P((char*start)); int - getline P((void)); + pm_getline P((void));
