FreeBSD Bugzilla – Attachment 129621 Details for
Bug 173635
[maintainer] mail/opendkim update to 2.7.2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
opendkim.diff
opendkim.diff (text/plain; charset=us-ascii), 5.07 KB, created by
Guido Falsi
on 2012-11-15 22:05:38 UTC
(
hide
)
Description:
opendkim.diff
Filename:
MIME Type:
Creator:
Guido Falsi
Created:
2012-11-15 22:05:38 UTC
Size:
5.07 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 307439) >+++ Makefile (working copy) >@@ -2,7 +2,7 @@ > # $FreeBSD$ > > PORTNAME= opendkim >-PORTVERSION= 2.7.1 >+PORTVERSION= 2.7.2 > CATEGORIES= mail security > MASTER_SITES= SF > MASTER_SITE_SUBDIR= ${PORTNAME} \ >@@ -85,7 +85,7 @@ > CONFIGURE_ARGS+=--docdir=${WRKDIR}/doc > .endif > >-.if ${PORT_OPTIONS:MSTATS} || ${PORT_OPTIONS:MSTATSEXT} >+.if ${PORT_OPTIONS:MSTATS} > CONFIGURE_ARGS+= --enable-stats > MAN8+= opendkim-expire.8 opendkim-gengraphs.8 \ > opendkim-genstats.8 opendkim-stats.8 >@@ -99,8 +99,8 @@ > .endif > .if ${PORT_OPTIONS:MPOPAUTH} \ > || ${PORT_OPTIONS:MQUERY_CACHE} \ >- || ${PORT_OPTIONS:MLDAP_CACHING} \ >- || ${PORT_OPTIONS:MREPUTATION} \ >+ || (${PORT_OPTIONS:MFFR} && ${PORT_OPTIONS:MLDAP_CACHING} ) \ >+ || (${PORT_OPTIONS:MFFR} && ${PORT_OPTIONS:MREPUTATION} ) \ > || ${PORT_OPTIONS:MSTATS} > . if ${PORT_OPTIONS:MBDB_BASE} > CONFIGURE_ARGS+= --with-db-lib=c >@@ -142,7 +142,7 @@ > .else > CONFIGURE_ARGS+= --without-openldap > .endif >-.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MRBL} || ${PORT_OPTIONS:MSTATSEXT} >+.if ${PORT_OPTIONS:MLUA} > CONFIGURE_ARGS+= --with-lua > . if ${PORT_OPTIONS:MFILTER} > MAN3+= opendkim-lua.3 >Index: Makefile.features >=================================================================== >--- Makefile.features (revision 307439) >+++ Makefile.features (working copy) >@@ -75,6 +75,7 @@ > CONFIGURE_ARGS+= --enable-rbl > MAN3+= rbl.3 > PLIST_SUB+= RBL="" >+PORT_OPTIONS+= LUA > .else > PLIST_SUB+= RBL="@comment " > .endif >@@ -102,11 +103,14 @@ > --with-libcurl > LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl > . if ${PORT_OPTIONS:MXML} >-CONFIGURE_ARGS+= --with-libxml2 >+CONFIGURE_ARGS+= --without-libjansson --with-libxml2 > LIB_DEPENDS+= xml2:${PORTSDIR}/textproc/libxml2 >+PLIST_SUB+= JANSSON="@comment " > . else > CONFIGURE_ARGS+= --with-libjansson > LIB_DEPENDS+= jansson:${PORTSDIR}/devel/jansson >+MAN8+= autobuild.8 >+PLIST_SUB+= JANSSON="" > . endif > MAN3+= ut.3 > MAN8+= opendkim-genrates.8 opendkim-modtotals.8 \ >@@ -131,6 +135,7 @@ > > .if ${PORT_OPTIONS:MSTATSEXT} > CONFIGURE_ARGS+= --enable-statsext >+PORT_OPTIONS+= LUA STATS > .endif > > .if ${PORT_OPTIONS:MVBR} >Index: distinfo >=================================================================== >--- distinfo (revision 307439) >+++ distinfo (working copy) >@@ -1,2 +1,2 @@ >-SHA256 (opendkim-2.7.1.tar.gz) = 782c030ce3b09d9ef536d2b98910d5a9289ba2128e8392e6ff568b2ade0282ed >-SIZE (opendkim-2.7.1.tar.gz) = 1153665 >+SHA256 (opendkim-2.7.2.tar.gz) = cf72a26506ef48a2c6b231947226ab460cdb6e05b18176ee42a94b3b6d521b42 >+SIZE (opendkim-2.7.2.tar.gz) = 1156510 >Index: files/patch-Makefile.in >=================================================================== >--- files/patch-Makefile.in (revision 307439) >+++ files/patch-Makefile.in (working copy) >@@ -1,29 +0,0 @@ >---- ./Makefile.in.orig 2012-10-31 03:14:49.000000000 +0900 >-+++ ./Makefile.in 2012-11-12 16:39:23.000000000 +0900 >-@@ -61,7 +61,6 @@ >- @STATS_TRUE@am__append_6 = stats >- @REPUTE_TRUE@am__append_7 = libut reputation >- @REPRRD_TRUE@am__append_8 = reprrd >--@JANSSON_TRUE@am__append_9 = autobuild >- subdir = . >- DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \ >- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ >-@@ -139,8 +138,7 @@ >- CTAGS = ctags >- CSCOPE = cscope >- DIST_SUBDIRS = libstrl libopendkim contrib docs libvbr librbl \ >-- libdkimrep miltertest stats libut reputation reprrd autobuild \ >-- opendkim >-+ libdkimrep miltertest stats libut reputation reprrd opendkim >- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) >- distdir = $(PACKAGE)-$(VERSION) >- top_distdir = $(distdir) >-@@ -419,7 +417,7 @@ >- SUBDIRS = $(am__append_1) libopendkim contrib docs $(am__append_2) \ >- $(am__append_3) $(am__append_4) $(am__append_5) \ >- $(am__append_6) $(am__append_7) $(am__append_8) \ >-- $(am__append_9) opendkim >-+ opendkim >- dist_doc_DATA = FEATURES KNOWNBUGS LICENSE LICENSE.Sendmail \ >- RELEASE_NOTES.Sendmail >- >Index: files/patch-libopendkim__dkim.c >=================================================================== >--- files/patch-libopendkim__dkim.c (revision 307439) >+++ files/patch-libopendkim__dkim.c (working copy) >@@ -1,20 +0,0 @@ >---- ./libopendkim/dkim.c.orig 2012-10-19 05:22:16.000000000 +0900 >-+++ ./libopendkim/dkim.c 2012-10-20 15:52:54.000000000 +0900 >-@@ -938,7 +938,7 @@ >- dkim_dstring_cat(dkim->dkim_sslerrbuf, "; "); >- >- dkim_dstring_cat(dkim->dkim_sslerrbuf, >-- gnutls_strerror(status)); >-+ (u_char *) gnutls_strerror(status)); >- } >- >- #else /* USE_GNUTLS */ >-@@ -1004,7 +1004,7 @@ >- dkim_dstring_cat(sig->sig_sslerrbuf, "; "); >- >- dkim_dstring_cat(sig->sig_sslerrbuf, >-- gnutls_strerror(status)); >-+ (u_char *) gnutls_strerror(status)); >- } >- >- #else /* USE_GNUTLS */ >Index: pkg-plist >=================================================================== >--- pkg-plist (revision 307439) >+++ pkg-plist (working copy) >@@ -1,4 +1,5 @@ > @comment $FreeBSD$ >+%%REPUTE%%%%JANSSON%%bin/autobuild > %%LUA%%bin/miltertest > %%REPRRD%%bin/opendkim-reprrdimport > %%ODBX%%%%STATS%%bin/opendkim-spam
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 173635
:
129620
| 129621 |
129622
|
129623