head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.90 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.88 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.86 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.84 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.82 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.80 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.78 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.76 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.74 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.72 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.70 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.68 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.66 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.64 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.62 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.60 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.58 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.56 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.54 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.52 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.50 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.48 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.46 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.42 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.22 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.44 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.40 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.38 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.36 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.34 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.32 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.30 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.28 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.26 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.24 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.20 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.18 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.16 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.14 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.12 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.10 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.8 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.6 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.4 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.2 pkgsrc-2015Q1-base:1.2 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 Exp; 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$ --- util.c.orig 2012-06-07 16:51:49.000000000 +0900 +++ util.c 2015-03-11 13:54:18.000000000 +0900 @@@@ -42,6 +42,11 @@@@ static char *_id_ = "$Id: util.c,v 1.23 # include "common.h" # include "extern.h" +static void tv_sub P((struct timeval *, struct timeval *, struct timeval *)); +static int hash_func P((char *)); +struct dns_stat *hash_query_lookup P((char *, struct dns_stat ***)); +static void hash_map_enter P((char *, struct host_map *)); + char * newstr(str) char *str; @@@@ -435,7 +440,7 @@@@ struct host_map ***ptr; return NULL; } -void +static void hash_map_enter(name, newmapp) char *name; struct host_map *newmapp; @ 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 @d3 4 a6 3 --- util.c.orig 2002-01-20 23:19:44.000000000 +0900 +++ util.c @@@@ -41,6 +41,11 @@@@ d18 1 a18 152 @@@@ -49,7 +54,7 @@@@ ptr = (char *)MALLOC(strlen(str) + 1); if (ptr == NULL) { - log(LOG_NOTICE, "out of memory (newstr)"); + mylog(LOG_NOTICE, "out of memory (newstr)"); return NULL; } strcpy(ptr, str); @@@@ -109,7 +114,7 @@@@ tv_sub(&ct, &pt, &dt); d.ru_maxrss = c.ru_maxrss - p.ru_maxrss; d.ru_nivcsw = c.ru_nivcsw - p.ru_nivcsw; - log(LOG_INFO, "time=%d.%03d+%d.%03d/%d.%03d rss=%ld nivcsw=%ld (%s)", + mylog(LOG_INFO, "time=%d.%03d+%d.%03d/%d.%03d rss=%ld nivcsw=%ld (%s)", d.ru_utime.tv_sec, d.ru_utime.tv_usec/1000, d.ru_stime.tv_sec, d.ru_stime.tv_usec/1000, dt.tv_sec, dt.tv_usec/1000, @@@@ -139,7 +144,7 @@@@ } if (cnf.debug & DEBUG_HASH) - log(LOG_DEBUG, "hash_func(%s) = %d", name, val); + mylog(LOG_DEBUG, "hash_func(%s) = %d", name, val); return val; } @@@@ -165,7 +170,7 @@@@ if (strcasecmp(qp->name, name) == 0) { if (cnf.debug & DEBUG_HASH) - log(LOG_DEBUG, "query %s found in hash table", name); + mylog(LOG_DEBUG, "query %s found in hash table", name); return qp; } qp = qp->next; @@@@ -194,7 +199,7 @@@@ if (strcasecmp(domp->name, name) == 0) { if (cnf.debug & DEBUG_HASH) - log(LOG_DEBUG, "domain %s found in hash table", name); + mylog(LOG_DEBUG, "domain %s found in hash table", name); return domp; } domp = domp->hash; @@@@ -211,7 +216,7 @@@@ int idx = hash_func(name); if (cnf.debug & DEBUG_HASH) - log(LOG_DEBUG, "enter domain %s into hash table", name); + mylog(LOG_DEBUG, "enter domain %s into hash table", name); newdomp->hash = hash_domain[idx]; hash_domain[idx] = newdomp; @@@@ -228,21 +233,21 @@@@ int idx = hash_func(name); if (cnf.debug & DEBUG_HASH) - log(LOG_DEBUG, "look up domain(%s) index(%d)", name, idx); + mylog(LOG_DEBUG, "look up domain(%s) index(%d)", name, idx); dom_r_p = hash_domain_rcpts[idx]; while (dom_r_p != NULL) { if (strcasecmp(dom_r_p->name, name) == 0) { if (cnf.debug & DEBUG_HASH) - log(LOG_DEBUG, "hit domain(%s) rcpts(%d) in hash table", + mylog(LOG_DEBUG, "hit domain(%s) rcpts(%d) in hash table", name, dom_r_p->rcpts); return dom_r_p->rcpts; } dom_r_p = dom_r_p->hash; } if (cnf.debug & DEBUG_HASH) - log(LOG_DEBUG, "domain(%s) not found in hash table, return %d", + mylog(LOG_DEBUG, "domain(%s) not found in hash table, return %d", name, cnf.rcpts_trans); return cnf.rcpts_trans; } @@@@ -255,7 +260,7 @@@@ int idx = hash_func(name); if (cnf.debug & DEBUG_HASH) - log(LOG_DEBUG, "enter domain(%s) index(%d) rcpts(%d) into hash table", + mylog(LOG_DEBUG, "enter domain(%s) index(%d) rcpts(%d) into hash table", name, idx, newdom_r_p->rcpts); newdom_r_p->hash = hash_domain_rcpts[idx]; @@@@ -290,7 +295,7 @@@@ fp = fopen(cnf.rcpts_def, "r"); if (fp == NULL) { - log(LOG_NOTICE, "file %s not found", cnf.rcpts_def); + mylog(LOG_NOTICE, "file %s not found", cnf.rcpts_def); return -1; } /* read cnf.rcpts_def */ @@@@ -337,7 +342,7 @@@@ dom_r_p = (struct domain_rcpts*) MALLOC(sizeof(struct domain_rcpts)); if (dom_r_p == NULL) { - log(LOG_NOTICE, "out of memory (domain_rcpts)"); + mylog(LOG_NOTICE, "out of memory (domain_rcpts)"); fclose(fp); return -1; } @@@@ -345,7 +350,7 @@@@ dom_r_p->name = newstr(strp); if(dom_r_p->name == NULL) { - log(LOG_NOTICE, "out of memory (dom_r_p->name)"); + mylog(LOG_NOTICE, "out of memory (dom_r_p->name)"); fclose(fp); return -1; } @@@@ -356,7 +361,7 @@@@ fclose(fp); cnf.rcpts_trans = hash_domain_rcpts_lookup(DEFAULTRCPTS); if (cnf.debug & DEBUG_TRANS) - log(LOG_DEBUG, "set cnf.rcpts_trans = %d", cnf.rcpts_trans); + mylog(LOG_DEBUG, "set cnf.rcpts_trans = %d", cnf.rcpts_trans); return 0; } @@@@ -381,7 +386,7 @@@@ if (strcasecmp(hostp->name, name) == 0) { if (cnf.debug & DEBUG_HASH) - log(LOG_DEBUG, "host %s found in hash table", name); + mylog(LOG_DEBUG, "host %s found in hash table", name); return hostp; } hostp = hostp->hash; @@@@ -398,7 +403,7 @@@@ int idx = hash_func(name); if (cnf.debug & DEBUG_HASH) - log(LOG_DEBUG, "enter host %s into hash table", name); + mylog(LOG_DEBUG, "enter host %s into hash table", name); newhostp->hash = hash_host[idx]; hash_host[idx] = newhostp; @@@@ -426,7 +431,7 @@@@ if (strcasecmp(mapp->name, name) == 0) { if (cnf.debug & DEBUG_HASH) - log(LOG_DEBUG, "map %s found in hash table", name); + mylog(LOG_DEBUG, "map %s found in hash table", name); return mapp; } mapp = mapp->hash; @@@@ -434,7 +439,7 @@@@ a26 36 @@@@ -442,7 +447,7 @@@@ int idx = hash_func(name); if (cnf.debug & DEBUG_HASH) - log(LOG_DEBUG, "enter map %s into hash table", name); + mylog(LOG_DEBUG, "enter map %s into hash table", name); newmapp->hash = hash_map[idx]; hash_map[idx] = newmapp; @@@@ -462,7 +467,7 @@@@ fp = fopen(cnf.map, "r"); if (fp == NULL) { - log(LOG_NOTICE, "map %s not found", cnf.map); + mylog(LOG_NOTICE, "map %s not found", cnf.map); return -1; /* should be TEMPFAIL */ } while (fgets(buf, sizeof(buf), fp) != NULL) @@@@ -580,7 +585,7 @@@@ } argp++; } - log(LOG_DEBUG, "reading map: domain = %s, map = %s", + mylog(LOG_DEBUG, "reading map: domain = %s, map = %s", mapp->name, tmpbuf); } } @@@@ -604,7 +609,7 @@@@ while (p != NULL) { if (cnf.debug & DEBUG_MAP) - log(LOG_DEBUG, "searching host map for %s: %s", domain, p); + mylog(LOG_DEBUG, "searching host map for %s: %s", domain, p); if ((mapp = hash_map_lookup(p, NULL)) != NULL) { @