Hello community,
here is the log from the commit of package procmail for openSUSE:Factory
checked in at 2011-11-16 17:20:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/procmail (Old)
and /work/SRC/openSUSE:Factory/.procmail.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "procmail", Maintainer is "wer...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/procmail/procmail.changes 2011-09-23
12:41:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.procmail.new/procmail.changes 2011-11-16
17:22:20.000000000 +0100
@@ -1,0 +2,9 @@
+Mon Nov 14 14:14:34 UTC 2011 - wer...@suse.de
+
+- Go forward and add the patches from Debian
+- Also add ipv6 patch from openmamba
+- Adop or drop our own patches
+- Do not sleep a second on NFS based home shares
+- Support LMTP (rfc2033: Local Mail Transfer Protocol) server
+
+-------------------------------------------------------------------
New:
----
procmail-3.22-ipv6.patch
procmail-3.22-patches.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ procmail.spec ++++++
--- /var/tmp/diff_new_pack.5MJRh5/_old 2011-11-16 17:22:21.000000000 +0100
+++ /var/tmp/diff_new_pack.5MJRh5/_new 2011-11-16 17:22:21.000000000 +0100
@@ -29,13 +29,15 @@
Version: 3.22
Release: 252
Summary: A program for local e-mail delivery
-Source: procmail-%{version}.tar.bz2
+Source0: procmail-%{version}.tar.bz2
+Source1: procmail-%{version}-patches.tar.bz2
Patch0: procmail-%{version}-mailstat.patch
Patch1: procmail-%{version}.dif
Patch2: procmail-cflags.dif
Patch3: procmail-%{version}-headerconcat.dif
Patch4: procmail-%{version}-owl-truncate.dif
Patch5: procmail-%{version}-autoconf.dif
+Patch6: procmail-%{version}-ipv6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -50,13 +52,22 @@
Philip Guenther <guent...@sendmail.com>
%prep
-%setup
+%setup -q -b1
+for p in ../procmail-%{version}-patches/* ; do
+ test -e $p || break
+ echo Patch $p
+ patch -s -p1 --fuzz=0 < $p
+done
%patch0 -b .mailstat
%patch1
%patch2
%patch3
%patch4
%patch5
+%patch6 -p1 -b .ipv6
+sed -ri '\@^/\*@,\@\*/@{ s@^(/\*[^*]*)(/\*)@\1\*/ \2@; }' config.h
+sed -ri '\@^/\*@,\@\*/@{ s@^(/\*[^*]*)(/\*)@\1\*/ \2@; }' src/includes.h
+sed -ri '\@^#.*[[:blank:]]+/\*[^/]*$@M,\@\*/$@{ s@(^[[:blank:]]+)/\*@\1 @;}'
src/includes.h
%build
RPM_OPT_FLAGS="-std=c89 $RPM_OPT_FLAGS -Wno-parentheses -Wno-sign-compare
-Wno-unprototyped-calls"
++++++ procmail-3.22-ipv6.patch ++++++
--- procmail-3.22/src/autoconf
+++ procmail-3.22/src/autoconf 2006-10-24 12:51:01.000000000 +0000
@@ -68,8 +68,6 @@
# #define NOfsync
#Ok #define endpwent()
#Ok #define endgrent()
-#Ok #define endhostent()
-#Ok #define endservent()
#Ok #define endprotoent()
# #define h_0addr_list h_addr
#Ok #define NOpw_passwd
@@ -896,7 +894,7 @@
{uid_t vuid_t;i+=vuid_t=1;}
{gid_t vgid_t;i+=vgid_t=1;}
#ifndef NO_COMSAT
- {struct hostent vhostent;i+=!(vhostent.h_addr_list=0);}
+ {struct addrinfo res; i+=!(res.ai_socktype=0);}
#endif
#ifndef NOuname
{struct utsname vutsname;i+=!(*vutsname.nodename='\0');}
@@ -917,8 +915,6 @@
test -z "$i3" && grepfor mode_t 'typedef int mode_t;' && i3=I
test -z "$i4" && grepfor uid_t 'typedef int uid_t;' && i4=I
test -z "$i5" && grepfor gid_t 'typedef int gid_t;' && i5=I
- test -z "$i6" && grepfor h_addr_list '#define h_0addr_list h_addr' && i6=I
- test -z "$i6" && grepfor hostent '#define h_0addr_list h_addr' && i6=I
test -z "$i6" && grepfor member '#define h_0addr_list h_addr' && i6=I
test -z "$i7" && grepfor utsname "#define NOuname \
/* <sys/utsname.h> is there, but empty */" && i7=I
@@ -1048,8 +1044,12 @@
{struct utsname b;uname(&b);}
#endif
#ifndef NO_COMSAT
- gethostbyname("0");getprotobyname(COMSATprotocol);endhostent();endservent();
- endprotoent();
+ {
+ struct addrinfo *res, hints;
+ memset(&hints, '\0', sizeof(hints));
+ if(getaddrinfo(COMSAThost,BIFF_serviceport,&hints,&res))
+ freeaddrinfo(res);
+ }
#endif
_exit(0);
return 0;}
@@ -1103,14 +1103,9 @@
/* <sys/utsname.h> defines it, the libraries don't */"
grepfor endpwent '#define endpwent()'
grepfor endgrent '#define endgrent()'
-if grepfor gethostbyname '#define NO_COMSAT'
+if grepfor getaddrinfo '#define NO_COMSAT'
then
:
-else
- grepfor getprotobyname '#define UDP_protocolno 17'
- grepfor endhostent '#define endhostent()'
- grepfor endservent '#define endservent()'
- grepfor endprotoent '#define endprotoent()'
fi
grepfor strstr '#define SLOWstrstr' ||
grepfor clock '#define SLOWstrstr'
@@ -1239,39 +1234,9 @@
printf("/* Insufficient memory to perform the benchmark! */\n");
#endif /* SLOWstrstr */
#ifndef NO_COMSAT
-#ifndef UDP_protocolno
- ;{ const struct protoent*p;
- if(p=getprotobyname(COMSATprotocol))
- { printf("#define UDP_protocolno %d\n",p->p_proto);
-#else
- ;{ if(1)
- {
-#endif
- ;{ const struct servent*serv;
- if(serv=getservbyname(COMSATservice,COMSATprotocol))
- printf("#define BIFF_serviceport \"%d\"\n",
- ntohs(serv->s_port));
- }
-#ifdef AF_INET
- ;{ const struct hostent*host;
- if(!strcmp("localhost",COMSAThost)&&
- (host=gethostbyname(COMSAThost))&&
- host->h_0addr_list&&host->h_addrtype==AF_INET&&
- host->h_length)
- { int j=host->h_length;
- const unsigned char*ad=(void*)host->h_0addr_list;
- printf("#define IP_localhost {");
- printf("%d",*ad++);
- while(--j)
- printf(",%d",*ad++);
- puts("}");
- }
- }
+#ifndef AF_INET
+ puts("#define NO_COMSAT");
#endif /* AF_INET */
- }
- else
- puts("#define NO_COMSAT");
- }
#endif /* NO_COMSAT */
;{ unsigned long s=(size_t)~0;int bits;
for(bits=1;s>>=1;bits++);
--- procmail-3.22/src/network.h.ipv6 1999-04-17 08:18:45.000000000 +0200
+++ procmail-3.22/src/network.h 2006-10-24 14:46:44.000000000 +0200
@@ -1,19 +1,13 @@
/*$Id: network.h,v 1.7 1997/04/02 03:15:41 srb Exp $*/
-#include <sys/socket.h> /* socket() sendto() AF_INET
+#include <sys/socket.h> /* socket() sendto() */
/* SOCK_DGRAM */
-#include <netdb.h> /* gethostbyname() getservbyname()
- /* getprotobyname() */
-#include <netinet/in.h> /* htons() struct sockaddr_in */
+#include <netdb.h> /* getaddrinfo() */
#ifndef BIFF_serviceport
#define BIFF_serviceport COMSATservice
#endif
-#ifndef h_0addr_list
-#define h_0addr_list h_addr_list[0] /* POSIX struct member */
-#endif
-
#ifndef NO_const /* since network.h is outside the autoconf const check */
#ifdef const /* loop, we need this backcheck for some systems */
#undef const
--- procmail-3.22/src/comsat.c.ipv6 2006-10-24 14:46:44.000000000 +0200
+++ procmail-3.22/src/comsat.c 2006-10-24 14:46:44.000000000 +0200
@@ -27,7 +27,8 @@
#include "comsat.h"
static int csvalid; /* is it turned on with a good address? */
-static struct sockaddr_in csaddr;
+static struct addrinfo cai;
+static struct sockaddr *csaddr;
static char*cslastf,*cslgname;
void setlfcs(folder)const char*folder; /* set lastfolder for comsat */
@@ -62,56 +63,32 @@
}
int setcomsat(chp)const char*chp;
-{ char*chad;int newvalid; struct sockaddr_in newaddr;
+{ char*chad;int newvalid; struct addrinfo *res, hints;
chad=strchr(chp,SERV_ADDRsep); /* @ separator? */
if(!chad&&!renvint(-1L,chp))
return csvalid=0; /* turned off comsat */
newvalid=1;
if(chad)
*chad++='\0'; /* split the specifier */
+ if(!chad||!*chp) /* no service */
+ chp=BIFF_serviceport; /* new balls please! */
if(!chad||!*chad) /* no host */
-#ifndef IP_localhost /* Is "localhost" preresolved? */
chad=COMSAThost; /* nope, use default */
-#else /* IP_localhost */
- { static const unsigned char ip_localhost[]=IP_localhost;
- newaddr.sin_family=AF_INET;
- tmemmove(&newaddr.sin_addr,ip_localhost,sizeof ip_localhost);
- }
- else
-#endif /* IP_localhost */
- { const struct hostent*host; /* what host? paranoid
checks */
- if(!(host=gethostbyname(chad))||!host->h_0addr_list)
- { bbzero(&newaddr.sin_addr,sizeof newaddr.sin_addr);
- newvalid=0; /* host can't be found, too bad */
- }
- else
- { newaddr.sin_family=host->h_addrtype; /* address number found */
- tmemmove(&newaddr.sin_addr,host->h_0addr_list,host->h_length);
- }
- endhostent();
- }
- if(newvalid) /* so far, so good */
- { int s;
- if(!chad||!*chp) /* no service */
- chp=BIFF_serviceport; /* new balls please! */
- s=strtol(chp,&chad,10);
- if(chp!=chad) /* the service is not numeric */
- newaddr.sin_port=htons((short)s); /* network order */
- else
- { const struct servent*serv;
- serv=getservbyname(chp,COMSATprotocol); /* so get its no. */
- if(serv)
- newaddr.sin_port=serv->s_port;
- else
- { newaddr.sin_port=htons((short)0); /* no such service */
- newvalid=0;
- }
- endservent();
- }
- }
+ bzero(&hints,sizeof(hints));
+ hints.ai_socktype=SOCK_DGRAM;
+ hints.ai_flags=AI_ADDRCONFIG;
+ if(getaddrinfo(chad,chp,&hints,&res))
+ newvalid=0;
+
onguard(); /* update the address atomically */
if(csvalid=newvalid)
- tmemmove(&csaddr,&newaddr,sizeof(newaddr));
+ { if(csaddr)
+ free(csaddr);
+ csaddr=malloc(res->ai_addrlen);
+ tmemmove(csaddr,res->ai_addr,res->ai_addrlen);
+ tmemmove(&cai,res,sizeof(cai));
+ freeaddrinfo(res);
+ }
offguard();
return newvalid;
}
@@ -132,8 +109,8 @@
}
strlcat(buf,COMSATxtrsep,linebuf); /* custom seperator */
strlcat(buf,p,linebuf); /* where was it delivered? */
- if((s=socket(AF_INET,SOCK_DGRAM,UDP_protocolno))>=0)
- { sendto(s,buf,strlen(buf),0,(struct sockaddr*)&csaddr,sizeof(csaddr));
+ if((s=socket(cai.ai_family,cai.ai_socktype,cai.ai_protocol))>=0)
+ { sendto(s,buf,strlen(buf),0,csaddr,cai.ai_addrlen);
rclose(s);
yell("Notified comsat:",buf);
}
++++++ procmail-3.22.dif ++++++
--- /var/tmp/diff_new_pack.5MJRh5/_old 2011-11-16 17:22:21.000000000 +0100
+++ /var/tmp/diff_new_pack.5MJRh5/_new 2011-11-16 17:22:21.000000000 +0100
@@ -1,7 +1,3 @@
---- .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 @@
@@ -13,14 +9,6 @@
#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.
@@ -33,8 +21,8 @@
# -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
+-LIBPATHS=/lib64 /usr/lib64 /lib /usr/lib
++LIBPATHS=/lib64 /usr/lib64 /lib /usr/lib
-GCC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat -Wtraditional \
+GCC_WARNINGS = -pedantic -Wreturn-type -Wunused -Wformat -Wtraditional \
@@ -65,221 +53,40 @@
# 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
++++ config.h 2011-11-14 13:45:23.579146109 +0000
+@@ -34,7 +34,7 @@
* 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"
+ #define DEFSPATH "PATH=/usr/local/bin:/usr/bin:/bin" /* */
+-#define DEFPATH "PATH=$HOME/bin:/usr/local/bin:/usr/bin:/bin"
/* */
++#define DEFPATH
"PATH=$HOME/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin" /*
*/
/* 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
+@@ -52,7 +52,7 @@
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
++#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 */
+@@ -79,7 +79,7 @@
- #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_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
*/
++#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
+@@ -91,7 +91,7 @@
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
++#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
++++++ procmail-cflags.dif ++++++
--- /var/tmp/diff_new_pack.5MJRh5/_old 2011-11-16 17:22:21.000000000 +0100
+++ /var/tmp/diff_new_pack.5MJRh5/_new 2011-11-16 17:22:21.000000000 +0100
@@ -1,22 +1,20 @@
--- Makefile
-+++ Makefile
-@@ -81,14 +81,14 @@
- # -lresolv # not really needed, is it?
-
++++ Makefile 2011-11-14 13:39:35.711147708 +0000
+@@ -82,13 +82,12 @@ SEARCHLIBS = -lm
# Informal list of directories where we look for the libraries in SEARCHLIBS
--LIBPATHS=/lib /usr/lib
-+LIBPATHS=/lib64 /usr/lib64 /lib /usr/lib
+ LIBPATHS=/lib64 /usr/lib64 /lib /usr/lib
-GCC_WARNINGS = -pedantic -Wreturn-type -Wunused -Wformat -Wtraditional \
- -Wpointer-arith -Wconversion -Waggregate-return \
- #-Wimplicit -Wshadow -Wid-clash-6 #-Wuninitialized
+GCC_WARNINGS = -pedantic -Wall -Wformat -Wpointer-arith
-+#-Wimplicit -Wshadow -Wid-clash-6 #-Wuninitialized
+XCFLAGS=
# The place to put your favourite extra cc flag
-CFLAGS0 = $(RPM_OPT_FLAGS) -D_GNU_SOURCE -pipe #$(GCC_WARNINGS)
-+CFLAGS0 = $(RPM_OPT_FLAGS) -D_GNU_SOURCE -pipe $(XCFLAGS)# $(GCC_WARNINGS)
- LDFLAGS0= -s
+-LDFLAGS0= -s
++CFLAGS0 = $(RPM_OPT_FLAGS) -D_GNU_SOURCE -pipe $(XCFLAGS) #$(GCC_WARNINGS)
++LDFLAGS0=
# Read my libs :-)
LIBS=
+
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
