diff options
author | madpilot <madpilot@FreeBSD.org> | 2013-03-29 06:58:55 +0800 |
---|---|---|
committer | madpilot <madpilot@FreeBSD.org> | 2013-03-29 06:58:55 +0800 |
commit | c0344700b2a1326e837dc48ce38b07749d2ab197 (patch) | |
tree | 490f30ab1c292c0e27516d542480f7852275afca | |
parent | 65d38e40f7cc8b34fb328e7971880852f9008b28 (diff) | |
download | freebsd-ports-gnome-c0344700b2a1326e837dc48ce38b07749d2ab197.tar.gz freebsd-ports-gnome-c0344700b2a1326e837dc48ce38b07749d2ab197.tar.zst freebsd-ports-gnome-c0344700b2a1326e837dc48ce38b07749d2ab197.zip |
Update to 2.8.2
PR: ports/177433
Submitted by: Hirohisa Yamaguchi <umq@ueo.co.jp> (maintainer)
-rw-r--r-- | mail/opendkim/Makefile | 3 | ||||
-rw-r--r-- | mail/opendkim/Makefile.options | 6 | ||||
-rw-r--r-- | mail/opendkim/distinfo | 4 | ||||
-rw-r--r-- | mail/opendkim/files/patch-libopendkim__dkim-cache.c | 18 | ||||
-rw-r--r-- | mail/opendkim/files/patch-libopendkim__tests__t-test49.c | 26 | ||||
-rw-r--r-- | mail/opendkim/files/patch-librbl__rbl.c | 10 | ||||
-rw-r--r-- | mail/opendkim/files/patch-opendkim__opendkim.c | 33 |
7 files changed, 50 insertions, 50 deletions
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile index ee415ecfea30..0653fd7b57fa 100644 --- a/mail/opendkim/Makefile +++ b/mail/opendkim/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= opendkim -PORTVERSION= 2.8.0 +PORTVERSION= 2.8.2 CATEGORIES= mail security MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME} \ @@ -156,6 +156,7 @@ PLIST_SUB+= LUA="@comment " pre-configure: ${REINPLACE_CMD} -e '/PKG_CONFIG/s/lua5/lua-5/' \ + -e '/PKG_CONFIG/s/cyrussasl/libsasl2/' \ ${WRKSRC}/configure post-patch: diff --git a/mail/opendkim/Makefile.options b/mail/opendkim/Makefile.options index 92df0e9a2893..42d889629a37 100644 --- a/mail/opendkim/Makefile.options +++ b/mail/opendkim/Makefile.options @@ -4,8 +4,7 @@ # This file is used to tune build time options. # Please refer FEATURES file distributed with the source for details. -OPTIONS_DEFINE+= XML FFR -XML_DESC= Prefer textproc/libxml2 to devel/jansson for JSON processing +OPTIONS_DEFINE+= FFR FFR_DESC= Use features marked as For-Future-Releases OPTIONS_GROUP+= FFR @@ -15,7 +14,7 @@ OPTIONS_GROUP_FFR= ADSP_LISTS ALLSYMBOLS ATPS CODECOVERAGE \ LDAP_CACHING POSTGRES_RECONNECT_HACK \ RATE_LIMIT RBL REDIRECT REPLACE_RULES REPRRD \ REPUTATION RESIGN SENDER_MACRO SOCKETDB \ - STATSEXT VBR + STATSEXT VBR XML ADSP_LISTS_DESC= ADSP filtering for lists (experimental) ALLSYMBOLS_DESC= Export internal symbols for test @@ -41,3 +40,4 @@ SENDER_MACRO_DESC= Macro to determine sender SOCKETDB_DESC= Arbitrary socket data sets STATSEXT_DESC= Extended stats VBR_DESC= Vouch-By-Reference support +XML_DESC= Prefer textproc/libxml2 to devel/jansson for JSON processing diff --git a/mail/opendkim/distinfo b/mail/opendkim/distinfo index 42f363f302ce..0561502e30ff 100644 --- a/mail/opendkim/distinfo +++ b/mail/opendkim/distinfo @@ -1,2 +1,2 @@ -SHA256 (opendkim-2.8.0.tar.gz) = a7b369b2182031d53257cbbac7ed99d70b00ebc442dfb832dc7d78d5d7b0c31c -SIZE (opendkim-2.8.0.tar.gz) = 1175377 +SHA256 (opendkim-2.8.2.tar.gz) = 6ccb6a4a8906e18e2c487669bf0a24e7b8e7fd791da38ff45a5ab25264f071bc +SIZE (opendkim-2.8.2.tar.gz) = 1181815 diff --git a/mail/opendkim/files/patch-libopendkim__dkim-cache.c b/mail/opendkim/files/patch-libopendkim__dkim-cache.c deleted file mode 100644 index e580fba6a897..000000000000 --- a/mail/opendkim/files/patch-libopendkim__dkim-cache.c +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/libopendkim/dkim-cache.c b/libopendkim/dkim-cache.c -index 1bb10e8..3a0d6c5 100644 ---- ./libopendkim/dkim-cache.c -+++ ./libopendkim/dkim-cache.c -@@ -508,7 +508,13 @@ dkim_cache_stats(DB *db, u_int *queries, u_int *hits, u_int *expired, - #if DB_VERSION_CHECK(2,0,0) - DB_HASH_STAT *sp; - -+# if DB_VERSION_CHECK(4,3,0) - if (db->stat(db, NULL, (void *) &sp, 0) != 0) -+# elif DB_VERSION_CHECK(4,0,0) -+ if (db->stat(db, (void *) &sp, 0) != 0) -+# else /* DB_VERSION_CHECK(4,0,0) */ -+ if (db->stat(db, (void *) &sp, NULL, 0) != 0) -+# endif /* DB_VERSION_CHECK(4,0,0) */ - { - *keys = (u_int) -1; - } diff --git a/mail/opendkim/files/patch-libopendkim__tests__t-test49.c b/mail/opendkim/files/patch-libopendkim__tests__t-test49.c deleted file mode 100644 index 14ce16c841e5..000000000000 --- a/mail/opendkim/files/patch-libopendkim__tests__t-test49.c +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/libopendkim/tests/t-test49.c b/libopendkim/tests/t-test49.c -index e54cb37..318ad8a 100644 ---- ./libopendkim/tests/t-test49.c -+++ ./libopendkim/tests/t-test49.c -@@ -53,7 +53,7 @@ main(int argc, char **argv) - - int status; - int err; -- u_int s1, s2, s3; -+ u_int s1, s2, s3, s4; - size_t buflen; - DB *cache; - char buf[BUFRSZ + 1]; -@@ -99,10 +99,11 @@ main(int argc, char **argv) - assert(status == 1); - - printf("--- retrieve cache stats\n"); -- dkim_cache_stats(&s1, &s2, &s3); -+ dkim_cache_stats(cache, &s1, &s2, &s3, &s4, FALSE); - assert(s1 == 3); - assert(s2 == 1); - assert(s3 == 1); -+ assert(s4 == 0); - - dkim_cache_close(cache); - #endif /* ! QUERY_CACHE */ diff --git a/mail/opendkim/files/patch-librbl__rbl.c b/mail/opendkim/files/patch-librbl__rbl.c new file mode 100644 index 000000000000..bce732b45bdc --- /dev/null +++ b/mail/opendkim/files/patch-librbl__rbl.c @@ -0,0 +1,10 @@ +--- ./librbl/rbl.c.orig 2012-10-25 07:12:31.000000000 +0900 ++++ ./librbl/rbl.c 2013-03-21 02:26:41.000000000 +0900 +@@ -312,6 +312,7 @@ + + free(tmp); + #endif /* HAVE_RES_SETSERVERS */ ++ return 0; + } + + /* diff --git a/mail/opendkim/files/patch-opendkim__opendkim.c b/mail/opendkim/files/patch-opendkim__opendkim.c new file mode 100644 index 000000000000..6c75b0d31e17 --- /dev/null +++ b/mail/opendkim/files/patch-opendkim__opendkim.c @@ -0,0 +1,33 @@ +--- ./opendkim/opendkim.c.orig 2013-03-20 03:02:40.000000000 +0900 ++++ ./opendkim/opendkim.c 2013-03-21 02:47:29.000000000 +0900 +@@ -12421,7 +12421,7 @@ + { + syslog(LOG_INFO, + "%s: can't parse default sender value '%s'", +- dfc->mctx_jobid, from); ++ dfc->mctx_jobid, conf->conf_defsender); + } + #endif /* _FFR_DEFAULT_SENDER */ + } +@@ -14945,8 +14945,8 @@ + for (c = 0; c < nsigs && domain == NULL; c++) + { + if ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_PASSED) == 0 || +- (dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_TESTKEY) != 0 && +- dkim_sig_getbh(sigs[c]) != DKIM_SIGBH_MATCH) ++ ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_TESTKEY) != 0 && ++ dkim_sig_getbh(sigs[c]) != DKIM_SIGBH_MATCH)) + continue; + + cd = dkim_sig_getdomain(sigs[c]); +@@ -15121,8 +15121,8 @@ + for (c = 0; c < nsigs; c++) + { + if ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_PASSED) == 0 || +- (dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_TESTKEY) != 0 && +- dkim_sig_getbh(sigs[c]) != DKIM_SIGBH_MATCH) ++ ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_TESTKEY) != 0 && ++ dkim_sig_getbh(sigs[c]) != DKIM_SIGBH_MATCH)) + continue; + + checked = TRUE; |