pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail/smtpfeed Add patches for reduce/resolve compile p...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8472106a48dd
branches:  trunk
changeset: 516581:8472106a48dd
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Jul 23 15:00:41 2006 +0000

description:
Add patches for reduce/resolve compile problem with gcc-4, especially
on NetBSD/powerpc reported by Makoto Fujiwara.

These patches are slightly aggressive adding most of proto type.
So, please report me if there is any problem.

No PKGREVISION bump since it should change nothing for binary package.

diffstat:

 mail/smtpfeed/distinfo         |    13 +-
 mail/smtpfeed/patches/patch-ac |   143 +++++
 mail/smtpfeed/patches/patch-ad |    14 +
 mail/smtpfeed/patches/patch-ae |  1089 ++++++++++++++++++++++++++++++++++++++++
 mail/smtpfeed/patches/patch-af |    99 +++
 mail/smtpfeed/patches/patch-ag |   100 +++
 mail/smtpfeed/patches/patch-ah |    25 +
 mail/smtpfeed/patches/patch-ai |   136 ++++
 mail/smtpfeed/patches/patch-aj |    31 +
 mail/smtpfeed/patches/patch-ak |    23 +
 mail/smtpfeed/patches/patch-al |   967 +++++++++++++++++++++++++++++++++++
 mail/smtpfeed/patches/patch-am |   212 +++++++
 12 files changed, 2851 insertions(+), 1 deletions(-)

diffs (truncated from 2905 to 300 lines):

diff -r 9461aebc99f8 -r 8472106a48dd mail/smtpfeed/distinfo
--- a/mail/smtpfeed/distinfo    Sun Jul 23 14:47:14 2006 +0000
+++ b/mail/smtpfeed/distinfo    Sun Jul 23 15:00:41 2006 +0000
@@ -1,6 +1,17 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 09:59:29 agc Exp $
+$NetBSD: distinfo,v 1.7 2006/07/23 15:00:41 taca Exp $
 
 SHA1 (smtpfeed-1.18.tar.gz) = c5875be954a12035658c57dfca0d032609e4e057
 RMD160 (smtpfeed-1.18.tar.gz) = cb477e5e3de9cb422aa2a3b612486ad819c8f8bf
 Size (smtpfeed-1.18.tar.gz) = 140293 bytes
 SHA1 (patch-aa) = e0ba34dd816d349ecedbc2a76cef9e70b396c655
+SHA1 (patch-ac) = d5b33823fa1ad9910ec97719f47c4265acf1dccc
+SHA1 (patch-ad) = 4ecd4ae9ba72997ed617158862e8801a9977472a
+SHA1 (patch-ae) = 33f2fc505db76c9fcb5e0b62b34797256c95db6b
+SHA1 (patch-af) = 2fd2dfa124a0ab842b739e85998e4b4a32e5eb71
+SHA1 (patch-ag) = a0956209ee563f73f3398d0fc0ee69cb57240cd5
+SHA1 (patch-ah) = d53b829ff765b7d555a6dda743a9496497679aa7
+SHA1 (patch-ai) = 2e29b595c1a946ea68186886a80bd5371b697e4e
+SHA1 (patch-aj) = f26af3988350e0df29fa7e97ea7c308ac6699125
+SHA1 (patch-ak) = 206286eb6872876fc4b67a6ad413229124b8bb80
+SHA1 (patch-al) = 6b8fbaf7a4882e6f179627b4e42ee5bf2e3964c3
+SHA1 (patch-am) = 63c35492d1cd9f01e9de901b7816e6f5d3e28c91
diff -r 9461aebc99f8 -r 8472106a48dd mail/smtpfeed/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/smtpfeed/patches/patch-ac    Sun Jul 23 15:00:41 2006 +0000
@@ -0,0 +1,143 @@
+$NetBSD: patch-ac,v 1.1 2006/07/23 15:00:41 taca Exp $
+
+--- address.c.orig     2002-01-20 23:19:42.000000000 +0900
++++ address.c
+@@ -42,6 +42,8 @@
+ # include "extern.h"
+ # include "smtp.h"
+ 
++static void dnsstatus P((struct recipient *, int, char *));
++
+ int
+ addmyalias(name)
+ char *name;
+@@ -58,12 +60,12 @@
+               ha = (struct hostalias *)MALLOC(sizeof(struct hostalias));
+               if (ha == NULL)
+               {
+-                      log(LOG_NOTICE, "out of memory (addmyalias)");
++                      mylog(LOG_NOTICE, "out of memory (addmyalias)");
+                       return -1;
+               }
+               /* bzero(ha, sizeof(struct hostalias)); */
+               if (cnf.debug & DEBUG_ADDRESS)
+-              log(LOG_DEBUG, "adding alias: %s", name);
++              mylog(LOG_DEBUG, "adding alias: %s", name);
+               len = strlen(name);
+               /* strip trailing dot */
+               while (len > 0 && name[len-1] == '.')
+@@ -114,7 +116,7 @@
+                       hostp = (struct host *)MALLOC(sizeof(struct host));
+                       if (hostp == NULL)
+                       {
+-                              log(LOG_NOTICE,
++                              mylog(LOG_NOTICE,
+                                       "out of memory (addinetaddress)");
+                               return -1;
+                       }
+@@ -153,7 +155,7 @@
+       if (addr == NULL)       /* just link from mxp */
+       {
+               if (cnf.debug & DEBUG_ADDRESS)
+-              log(LOG_DEBUG, "address info for %s linked", mxp->name);
++              mylog(LOG_DEBUG, "address info for %s linked", mxp->name);
+               return 0;
+       }
+ 
+@@ -170,13 +172,13 @@
+               {
+                 case AF_INET:
+                       bcopy(addr, &sin, sizeof(sin));
+-                      log(LOG_INFO, "got new address %s for %s, state reset",
++                      mylog(LOG_INFO, "got new address %s for %s, state reset",
+                               inet_ntoa(sin), mxp->name);
+                       break;
+ #if INET6
+                 case AF_INET6:
+                       inet_ntop(AF_INET6, addr, buf, sizeof(buf));
+-                      log(LOG_INFO, "got new address %s for %s, state reset",
++                      mylog(LOG_INFO, "got new address %s for %s, state reset",
+                               buf, mxp->name);
+ 
+                       break;
+@@ -193,19 +195,19 @@
+               {
+                 case AF_INET:
+                       bcopy(addr, &sin, sizeof(sin));
+-                      log(LOG_DEBUG, "DNS: registering %s=%s",
++                      mylog(LOG_DEBUG, "DNS: registering %s=%s",
+                               mxp->name, inet_ntoa(sin));
+                       break;
+ #if INET6
+                 case AF_INET6:
+                       inet_ntop(AF_INET6, addr, buf, sizeof(buf));
+-                      log(LOG_DEBUG, "DNS: registering %s=%s",
++                      mylog(LOG_DEBUG, "DNS: registering %s=%s",
+                               mxp->name, buf);
+ 
+                       break;
+ #endif
+                 default:
+-                      log(LOG_NOTICE,
++                      mylog(LOG_NOTICE,
+                               "DNS: invalid inet_domain %d at addinetaddress",
+                               inet_domain);
+               } 
+@@ -226,7 +228,7 @@
+       iap = (struct inetaddr *)MALLOC(sizeof(struct inetaddr));
+       if (iap == NULL)
+       {
+-              log(LOG_NOTICE, "out of memory (addinetaddress)");
++              mylog(LOG_NOTICE, "out of memory (addinetaddress)");
+               return -1;
+       }
+       bzero(iap, sizeof(struct inetaddr));
+@@ -235,7 +237,7 @@
+       iap->address = (char *)MALLOC(len);
+       if (iap->address == NULL)
+       {
+-              log(LOG_NOTICE, "out of memory (addinetaddress)");
++              mylog(LOG_NOTICE, "out of memory (addinetaddress)");
+               return -1;
+       }
+       bcopy(addr, iap->address, len);
+@@ -462,12 +464,12 @@
+       struct domain *d, **hashp;
+ 
+       if (cnf.debug & DEBUG_LMTP)
+-      log(LOG_DEBUG, "RCPT TO: %s notify=%s orcpt=%s", addr,
++      mylog(LOG_DEBUG, "RCPT TO: %s notify=%s orcpt=%s", addr,
+               (notify == NULL)?"":notify, (orcpt == NULL)?"":orcpt);
+       rcpt = (struct recipient *)MALLOC(sizeof(struct recipient));
+       if (rcpt == NULL)
+       {
+-              log(LOG_NOTICE, "out of memory (addrecipient)");
++              mylog(LOG_NOTICE, "out of memory (addrecipient)");
+               return -1;
+       }
+       bzero(rcpt, sizeof(struct recipient));
+@@ -493,7 +495,7 @@
+       if (d == NULL)
+       {
+               if (cnf.debug & DEBUG_LMTP)
+-              log(LOG_DEBUG, "new domain: %s", domain);
++              mylog(LOG_DEBUG, "new domain: %s", domain);
+               rcpt->domain = (struct domain *)MALLOC(sizeof(struct domain));
+               bzero(rcpt->domain, sizeof(struct domain));
+               rcpt->domain->name = newstr(domain);
+@@ -540,13 +542,13 @@
+       return 0;
+ }
+ 
+-void
++static void
+ dnsstatus(rcpt, rcode, response)
+ struct recipient *rcpt;
+ int rcode;
+ char *response;
+ {
+-      log(LOG_INFO, "(%d+%d+%d+%d/%d) relay=%s to=%s proto=%s delay=%d code=%d (%s)",            
++      mylog(LOG_INFO, "(%d+%d+%d+%d/%d) relay=%s to=%s proto=%s delay=%d code=%d (%s)",            
+               sti.nsent, sti.ndeferred, sti.nnsfailed,
+               sti.nsmtpfailed, sti.nrcpt, "unknown",
+               rcpt->address, "unknown", 0, rcode,   
diff -r 9461aebc99f8 -r 8472106a48dd mail/smtpfeed/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/smtpfeed/patches/patch-ad    Sun Jul 23 15:00:41 2006 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2006/07/23 15:00:41 taca Exp $
+
+--- common.h.orig      2002-01-20 23:20:44.000000000 +0900
++++ common.h
+@@ -425,3 +425,9 @@
+ #endif
+ };
+ typedef union SockAddrUnion SockAddr;
++
++#ifdef __STDC__
++#define P(c)  c
++#else
++#define P(c)
++#endif
diff -r 9461aebc99f8 -r 8472106a48dd mail/smtpfeed/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/smtpfeed/patches/patch-ae    Sun Jul 23 15:00:41 2006 +0000
@@ -0,0 +1,1089 @@
+$NetBSD: patch-ae,v 1.1 2006/07/23 15:00:41 taca Exp $
+
+--- dns.c.orig 2002-03-15 11:03:39.000000000 +0900
++++ dns.c
+@@ -79,6 +79,19 @@
+ # define RES_INSECURE1        0x00000400      /* type 1 security disabled */
+ #endif
+ 
++static int query_domain P((char *, int));
++static int process_query P((int));
++static int make_query P((struct dns_stat *, int));
++#if INET6
++static int whichserver P((const SockAddr *));
++#else
++static int whichserver P((const struct sockaddr_in *));
++#endif
++static void got_answer P((struct query_chain *, u_char *, int));
++static void remove_query P((struct query_chain *));
++static struct mx* newmx P((char *, int, int, struct domain *, long));
++static void show_query P((u_char *, u_char *, u_char *));
++
+ int
+ pregetmx(dl)
+ struct domain *dl;
+@@ -87,7 +100,6 @@
+       char **map_arg;
+       long stime, etime;
+       int n;
+-      static int query_domain(), process_query();
+ #ifdef INET6
+       SockAddr dsin;  /* dummy */
+ #endif
+@@ -109,7 +121,7 @@
+               }
+       }
+ 
+-      log(LOG_DEBUG, "start getting MXRRs with caching");
++      mylog(LOG_DEBUG, "start getting MXRRs with caching");
+       n = 0;
+       stime = time(NULL);
+       if (env.queueid != NULL)
+@@ -120,7 +132,7 @@
+       if (cnf.pgateway != NULL)
+       {
+               if (cnf.debug & DEBUG_DNS)
+-              log(LOG_DEBUG, "pregetting A of protocol gateway: %s",
++              mylog(LOG_DEBUG, "pregetting A of protocol gateway: %s",
+                       cnf.pgateway);
+ #ifdef INET6
+               if (cnf.inetdom & SMTP_V4)
+@@ -144,7 +156,7 @@
+       if (cnf.fallbackmx != NULL)
+       {
+               if (cnf.debug & DEBUG_DNS)
+-              log(LOG_DEBUG, "pregetting A of fallbackmx: %s",
++              mylog(LOG_DEBUG, "pregetting A of fallbackmx: %s",
+                       cnf.fallbackmx);
+ #ifdef INET6
+               if (cnf.inetdom & SMTP_V4)
+@@ -185,7 +197,7 @@
+ #endif
+                       {
+                               if (cnf.debug & DEBUG_DNS)
+-                              log(LOG_DEBUG,
++                              mylog(LOG_DEBUG,
+                                       "pregetting A of sourceIP: %s", p);
+ #ifdef INET6
+                               if (cnf.inetdom & SMTP_V4)
+@@ -243,7 +255,7 @@
+                        || (strcasecmp(*map_arg, "MX?") == 0))
+                       {
+                               if (cnf.debug & DEBUG_DNS)
+-                              log(LOG_DEBUG, "pregetting MX: %s", dp->name);
++                              mylog(LOG_DEBUG, "pregetting MX: %s", dp->name);
+                               if (query_domain(dp->name, T_MX) < 0)
+                                       return -1;
+                               n++;
+@@ -251,7 +263,7 @@
+                       else if (strcasecmp(*map_arg, "A") == 0)
+                       {
+                               if (cnf.debug & DEBUG_DNS)
+-                              log(LOG_DEBUG, "pregetting A: %s", dp->name);
++                              mylog(LOG_DEBUG, "pregetting A: %s", dp->name);
+ #ifdef INET6
+                               if (cnf.inetdom & SMTP_V4)
+                               {
+@@ -272,7 +284,7 @@
+                       else if (**map_arg != '[')
+                       {
+                               if (cnf.debug & DEBUG_DNS)
+-                              log(LOG_DEBUG, "pregetting MX: %s", *map_arg);
++                              mylog(LOG_DEBUG, "pregetting MX: %s", *map_arg);
+                               if (query_domain(*map_arg, T_MX) < 0)
+                                       return -1;
+                               n++;
+@@ -291,7 +303,7 @@
+                                       goto skip_preget_a;
+ 
+                               if (cnf.debug & DEBUG_DNS)
+-                              log(LOG_DEBUG,
++                              mylog(LOG_DEBUG,
+                                       "pregetting A of sourceIP: %s",
+                                       (*map_arg) + 1);
+ #ifdef INET6
+@@ -333,16 +345,16 @@
+               else
+                       setproctitle("syncing MX: %d", n);
+               if (cnf.debug & DEBUG_DNS)
+-              log(LOG_DEBUG, "syncing responses of MXRRs");



Home | Main Index | Thread Index | Old Index