pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/smtpfeed (pkgsrc)
details: https://anonhg.NetBSD.org/pkgsrc/rev/40d24e8ab42f
branches: trunk
changeset: 648545:40d24e8ab42f
user: mef <mef%pkgsrc.org@localhost>
date: Sun Mar 15 15:07:47 2015 +0000
description:
(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.
diffstat:
mail/smtpfeed/Makefile | 4 +-
mail/smtpfeed/distinfo | 25 +-
mail/smtpfeed/patches/patch-aa | 12 +-
mail/smtpfeed/patches/patch-ac | 143 ----
mail/smtpfeed/patches/patch-ad | 26 +-
mail/smtpfeed/patches/patch-ae | 1094 -------------------------------------
mail/smtpfeed/patches/patch-af | 99 ---
mail/smtpfeed/patches/patch-ag | 74 +--
mail/smtpfeed/patches/patch-ah | 25 -
mail/smtpfeed/patches/patch-ai | 102 +---
mail/smtpfeed/patches/patch-al | 905 +----------------------------
mail/smtpfeed/patches/patch-am | 198 +------
mail/smtpfeed/patches/patch-dns.c | 42 +
13 files changed, 149 insertions(+), 2600 deletions(-)
diffs (truncated from 2930 to 300 lines):
diff -r 7742d7e76f85 -r 40d24e8ab42f mail/smtpfeed/Makefile
--- a/mail/smtpfeed/Makefile Sun Mar 15 15:06:23 2015 +0000
+++ b/mail/smtpfeed/Makefile Sun Mar 15 15:07:47 2015 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2012/10/08 12:19:31 asau Exp $
+# $NetBSD: Makefile,v 1.37 2015/03/15 15:07:47 mef Exp $
-DISTNAME= smtpfeed-1.20
+DISTNAME= smtpfeed-1.23
CATEGORIES= mail
MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/smtpfeed/
diff -r 7742d7e76f85 -r 40d24e8ab42f mail/smtpfeed/distinfo
--- a/mail/smtpfeed/distinfo Sun Mar 15 15:06:23 2015 +0000
+++ b/mail/smtpfeed/distinfo Sun Mar 15 15:07:47 2015 +0000
@@ -1,18 +1,15 @@
-$NetBSD: distinfo,v 1.9 2014/09/25 14:14:47 jperkin Exp $
+$NetBSD: distinfo,v 1.10 2015/03/15 15:07:47 mef Exp $
-SHA1 (smtpfeed-1.20.tar.gz) = f055984526865200339557e5fa809f968decbcfd
-RMD160 (smtpfeed-1.20.tar.gz) = aa3c586f2c5b2907caa0d7a50257c4e5273cc25d
-Size (smtpfeed-1.20.tar.gz) = 141144 bytes
-SHA1 (patch-aa) = e0ba34dd816d349ecedbc2a76cef9e70b396c655
-SHA1 (patch-ac) = d5b33823fa1ad9910ec97719f47c4265acf1dccc
-SHA1 (patch-ad) = 4ecd4ae9ba72997ed617158862e8801a9977472a
-SHA1 (patch-ae) = 7e97d0bcfb76221a1b0d4a2264eba8169ce8687c
-SHA1 (patch-af) = 2fd2dfa124a0ab842b739e85998e4b4a32e5eb71
-SHA1 (patch-ag) = a0956209ee563f73f3398d0fc0ee69cb57240cd5
-SHA1 (patch-ah) = d53b829ff765b7d555a6dda743a9496497679aa7
-SHA1 (patch-ai) = 2e29b595c1a946ea68186886a80bd5371b697e4e
+SHA1 (smtpfeed-1.23.tar.gz) = 42b3f7ce55dc9f932de8573477d3497b4670e7b1
+RMD160 (smtpfeed-1.23.tar.gz) = 5411b3a363673052e92fbbc218ac55469cc4b061
+Size (smtpfeed-1.23.tar.gz) = 152178 bytes
+SHA1 (patch-aa) = 32d1850db968c28190346c90653d1fa2f55aebbc
+SHA1 (patch-ad) = 1523e0e55798c3868a48a86218597a785cebe850
+SHA1 (patch-ag) = fdf0caff3d90d0b1de8f0dc558e0410aa08be0f1
+SHA1 (patch-ai) = 915b1b68d081deec4fd68735729a5dd548bfd47c
SHA1 (patch-aj) = f26af3988350e0df29fa7e97ea7c308ac6699125
SHA1 (patch-ak) = 206286eb6872876fc4b67a6ad413229124b8bb80
-SHA1 (patch-al) = 9a4674777b1a7fef6f29c6e5aa1b7e04c1eb2f87
-SHA1 (patch-am) = 63c35492d1cd9f01e9de901b7816e6f5d3e28c91
+SHA1 (patch-al) = d01080e3debb3e2f756a5f33cf20fa6320905d09
+SHA1 (patch-am) = 56241227527f674bc1237bb3ac2c5ffb3f76db37
SHA1 (patch-configure) = 61f92773f797660e7b51f6b70ea88f3f949c5191
+SHA1 (patch-dns.c) = eb72a165e5d00f1e594764e2310e10ca519941aa
diff -r 7742d7e76f85 -r 40d24e8ab42f mail/smtpfeed/patches/patch-aa
--- a/mail/smtpfeed/patches/patch-aa Sun Mar 15 15:06:23 2015 +0000
+++ b/mail/smtpfeed/patches/patch-aa Sun Mar 15 15:07:47 2015 +0000
@@ -1,10 +1,14 @@
-$NetBSD: patch-aa,v 1.2 2000/02/22 01:31:26 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.3 2015/03/15 15:07:47 mef Exp $
+
+Don't need backup in DESTDIR
---- Makefile.in.orig Mon Feb 21 20:24:39 2000
-+++ Makefile.in Mon Feb 21 20:29:43 2000
-@@ -68,5 +68,4 @@
+--- Makefile~ 2012-06-08 10:32:25.000000000 +0900
++++ Makefile.in 2015-03-11 13:41:58.000000000 +0900
+@@ -69,7 +69,6 @@ clean:
+ ${RM} -f ${OBJS} ${OBJADDS} ${TARGET}
install:
- -mv -f ${DEST}/${TARGET} ${DEST}/${TARGET}.old
${INSTALL} ${TARGET} ${DEST}
+ gcc2-lint:
diff -r 7742d7e76f85 -r 40d24e8ab42f mail/smtpfeed/patches/patch-ac
--- a/mail/smtpfeed/patches/patch-ac Sun Mar 15 15:06:23 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-$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 7742d7e76f85 -r 40d24e8ab42f mail/smtpfeed/patches/patch-ad
--- a/mail/smtpfeed/patches/patch-ad Sun Mar 15 15:06:23 2015 +0000
+++ b/mail/smtpfeed/patches/patch-ad Sun Mar 15 15:07:47 2015 +0000
@@ -1,8 +1,26 @@
-$NetBSD: patch-ad,v 1.1 2006/07/23 15:00:41 taca Exp $
+$NetBSD: patch-ad,v 1.2 2015/03/15 15:07:47 mef Exp $
---- common.h.orig 2002-01-20 23:20:44.000000000 +0900
-+++ common.h
-@@ -425,3 +425,9 @@
+--- common.h.orig 2012-06-07 14:45:48.000000000 +0900
++++ common.h 2015-03-12 11:27:47.000000000 +0900
+@@ -253,7 +253,7 @@ struct host_map {
+ struct domain {
+ char *name; /* domain part of mail addr */
+ int stat; /* error status for MX query */
+- char *response; /* error response */
++ const char *response; /* error response */
+ struct mx *firstmx; /* first MX */
+ struct mx *curmx; /* working MX */
+ int checked; /* temporary local flag */
+@@ -284,7 +284,7 @@ struct recipient {
+ int stat; /* current status */
+ int result; /* final result */
+ int again; /* try the same MX again */
+- char *response; /* final response */
++ const char *response; /* final response */
+ struct domain *domain; /* domain part */
+ struct host *final;
+ struct recipient *next; /* next recipient */
+@@ -427,3 +427,9 @@ union SockAddrUnion {
#endif
};
typedef union SockAddrUnion SockAddr;
diff -r 7742d7e76f85 -r 40d24e8ab42f mail/smtpfeed/patches/patch-ae
--- a/mail/smtpfeed/patches/patch-ae Sun Mar 15 15:06:23 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1094 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2012/07/10 09:09:11 mef Exp $
-
-(1) Add some prototype for static functions
-(2) convert log -> mylog
- - log(LOG_DEBUG, "start getting MXRRs with caching");
- + mylog(LOG_DEBUG, "start getting MXRRs with caching");
-
---- dns.c.orig 2003-08-20 14:13:03.000000000 +0900
-+++ dns.c 2012-06-28 18:39:20.000000000 +0900
-@@ -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)
Home |
Main Index |
Thread Index |
Old Index