head 1.2; access; symbols pkgsrc-2014Q4:1.1.0.72 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.70 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.68 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.66 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.64 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.62 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.60 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.58 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.56 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.54 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.52 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.50 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.48 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.46 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.44 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.42 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.40 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.38 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.36 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.34 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.32 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.30 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.28 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.26 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.24 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.22 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.20 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.18 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.16 pkgsrc-2008Q1:1.1.0.14 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.12 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.10 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.8 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.6 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.4 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.2 pkgsrc-2006Q3-base:1.1; locks; strict; comment @# @; 1.2 date 2015.03.15.15.07.47; author mef; state dead; branches; next 1.1; commitid x7S0l58TA5XpmIdy; 1.1 date 2006.07.23.15.00.41; author taca; state Exp; branches; next ; desc @@ 1.2 log @(pkgsrc) - patch-aa was used to edit Makefile. Now it edits Makefile.in instead - patch-a[cefh] are removed, equivalent fix applied - patch-dns.c is added to silent prototype warning (upstream) - Update 1.20 to 1.23 ------------------- 1.23: Feb.17,2015: dns.c, smtp.c: typo fixed: INET6 should be AF_INET6 1.22: Jun.9,2012: smtp.c: logging whole message in multi-lined SMTP response. 1.21: Jun.7,2012: smtp.c, common.h, main.c: '-2' option added to avoid piggybacking among domains. (to support spec change on GoogleApps service) dns.c: definitions of functions with "static" are moved outside to avoid "invalid strage class" errors. *.c, extern.h: log() is renamed to logg() to avoid conflict. @ text @$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, @ 1.1 log @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. @ text @d1 1 a1 1 $NetBSD$ @