Attachment 159485 Details for Bug 202056 – patch

[patch] patch

p5-Mail-OpenDKIM.diff (text/plain), 6.63 KB, created by Guido Falsi on 2015-08-03 09:51:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2015-08-03 09:51:43 UTC

Size: 6.63 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 393467)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	Mail-OpenDKIM
> PORTVERSION=	4201
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	mail perl5
> MASTER_SITES=	CPAN
> PKGNAMEPREFIX=	p5-
>Index: files/patch-MANIFEST
>===================================================================
>--- files/patch-MANIFEST	(revision 0)
>+++ files/patch-MANIFEST	(working copy)
>@@ -0,0 +1,29 @@
>+--- MANIFEST.orig	2014-01-22 20:52:53 UTC
>++++ MANIFEST
>+@@ -29,9 +29,6 @@ t/dkim_getcachestats.t
>+ t/dkim_getdomain.t
>+ t/dkim_getmode.t
>+ t/dkim_getpartial.t
>+-t/dkim_getpolicystr.t
>+-t/dkim_getpresult.t
>+-t/dkim_getpresultstr.t
>+ t/dkim_getresultstr.t
>+ t/dkim_getsighdr.t
>+ t/dkim_getsighdr_d.t
>+@@ -44,16 +41,10 @@ t/dkim_mail_parse.t
>+ t/dkim_minbody.t
>+ t/dkim_ohdrs.t
>+ t/dkim_options.t
>+-t/dkim_policy.t
>+-t/dkim_policy_getdnssec.t
>+-t/dkim_policy_getreportinfo.t
>+-t/dkim_policy_state.t
>+-t/dkim_policy_syntax.t
>+ t/dkim_set_dns_callback.t
>+ t/dkim_set_final.t
>+ t/dkim_set_key_lookup.t
>+ t/dkim_set_margin.t
>+-t/dkim_set_policy_lookup.t
>+ t/dkim_set_prescreen.t
>+ t/dkim_set_signature_handle.t
>+ t/dkim_set_signature_handle_free.t
>
>Property changes on: files/patch-MANIFEST
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-OpenDKIM.xs
>===================================================================
>--- files/patch-OpenDKIM.xs	(revision 0)
>+++ files/patch-OpenDKIM.xs	(working copy)
>@@ -0,0 +1,206 @@
>+--- OpenDKIM.xs.orig	2014-01-22 20:50:02 UTC
>++++ OpenDKIM.xs
>+@@ -17,7 +17,6 @@
>+ static SV *dns_callback = (SV *)NULL;
>+ static SV *final_callback = (SV *)NULL;
>+ static SV *key_lookup_callback = (SV *)NULL;
>+-static SV *policy_lookup_callback = (SV *)NULL;
>+ static SV *prescreen_callback = (SV *)NULL;
>+ static SV *signature_handle_callback = (SV *)NULL;
>+ static SV *signature_handle_free_callback = (SV *)NULL;
>+@@ -160,50 +159,6 @@ call_key_lookup_callback(DKIM *dkim, DKI
>+ 
>+ /*
>+  * called when the OpenDKIMlibrary wants to call the callback function provided to
>+- * dkim_set_policy_lookup
>+- */
>+-static DKIM_CBSTAT
>+-call_policy_lookup_callback(DKIM *dkim, unsigned char *query, _Bool excheck, unsigned char *buf, size_t buflen, int *qstat)
>+-{
>+-	dSP;
>+-	int count, status;
>+-	SV *sv = policy_lookup_callback;
>+-
>+-	if(sv == NULL) {
>+-		croak("Internal error: call_policy_lookup_callback called, but nothing to call");
>+-		return DKIM_CBSTAT_ERROR;
>+-	}
>+-
>+-	PUSHMARK(SP);
>+-	XPUSHs(sv_2mortal(newSVpv((void *)dkim, SIZEOF_DKIM)));
>+-	XPUSHs(sv_2mortal(newSVpv((void *)query, 0)));
>+-	XPUSHs(sv_2mortal(newSViv(excheck)));
>+-	XPUSHs(sv_2mortal(newSVpv((void *)buf, buflen + 1)));
>+-	XPUSHs(sv_2mortal(newSViv(buflen)));
>+-	XPUSHs(sv_2mortal(newSVpv((void *)qstat, sizeof(int))));
>+-	PUTBACK;
>+-
>+-	count = call_sv(sv, G_SCALAR);
>+-
>+-	SPAGAIN;
>+-
>+-	if(count != 1) {
>+-		croak("Internal error: policy_lookup_callback routine returned %d items, 1 was expected",
>+-			count);
>+-		return DKIM_CBSTAT_ERROR;
>+-	}
>+-
>+-	status = POPi;
>+-
>+-	PUTBACK;
>+-	FREETMPS;
>+-	LEAVE;
>+-
>+-	return status;
>+-}
>+-
>+-/*
>+- * called when the OpenDKIMlibrary wants to call the callback function provided to
>+  * dkim_set_prescreen
>+  */
>+ static DKIM_CBSTAT
>+@@ -503,30 +458,6 @@ dkim_libversion()
>+ 		RETVAL
>+ 
>+ const char *
>+-dkim_getpolicystr(policy)
>+-		dkim_policy_t policy
>+-	CODE:
>+-		RETVAL = dkim_getpolicystr(policy);
>+-	OUTPUT:
>+-		RETVAL
>+-
>+-const char *
>+-dkim_getpresultstr(policy)
>+-		dkim_policy_t policy
>+-	CODE:
>+-		RETVAL = dkim_getpresultstr(policy);
>+-	OUTPUT:
>+-		RETVAL
>+-
>+-const char *
>+-dkim_getresultstr(result)
>+-		DKIM_STAT result
>+-	CODE:
>+-		RETVAL = dkim_getresultstr(result);
>+-	OUTPUT:
>+-		RETVAL
>+-
>+-const char *
>+ dkim_sig_geterrorstr(sigerr)
>+ 		DKIM_SIGERROR sigerr
>+ 	CODE:
>+@@ -710,20 +641,6 @@ _dkim_set_prescreen(libopendkim, func)
>+ 		RETVAL
>+ 
>+ DKIM_STAT
>+-_dkim_set_policy_lookup(libopendkim, func)
>+-		DKIM_LIB *libopendkim
>+-		SV *func
>+-	CODE:
>+-		if(policy_lookup_callback == (SV *)NULL)
>+-			policy_lookup_callback = newSVsv(func);
>+-		else
>+-			SvSetSV(policy_lookup_callback, func);
>+-
>+-		RETVAL = dkim_set_policy_lookup(libopendkim, call_policy_lookup_callback);
>+-	OUTPUT:
>+-		RETVAL
>+-
>+-DKIM_STAT
>+ _dkim_set_signature_handle(libopendkim, func)
>+ 		DKIM_LIB *libopendkim
>+ 		SV *func
>+@@ -1116,49 +1033,6 @@ _dkim_getmode(dkim)
>+ 	OUTPUT:
>+ 		RETVAL
>+ 
>+-DKIM_STAT
>+-_dkim_policy(dkim, pcode, pflags, pstate)
>+-		DKIM *dkim;
>+-		dkim_policy_t pcode = NO_INIT
>+-		unsigned int pflags = NO_INIT
>+-		DKIM_PSTATE *pstate
>+-	CODE:
>+-		RETVAL = dkim_policy(dkim, &pcode, &pflags, pstate);
>+-	OUTPUT:
>+-		pcode
>+-		pflags
>+-		RETVAL
>+-
>+-DKIM_PSTATE *
>+-_dkim_policy_state_new(dkim)
>+-		DKIM *dkim;
>+-	CODE:
>+-		RETVAL = dkim_policy_state_new(dkim);
>+-	OUTPUT:
>+-		RETVAL
>+-
>+-void
>+-_dkim_policy_state_free(pstate)
>+-		DKIM_PSTATE *pstate;
>+-	CODE:
>+-		dkim_policy_state_free(pstate);
>+-
>+-DKIM_STAT
>+-_dkim_policy_getreportinfo(dkim, addrbuf, addrlen, optsbuf, optslen, smtpbuf, smtplen, interval)
>+-		DKIM *dkim
>+-		char *addrbuf
>+-		size_t addrlen
>+-		char *optsbuf
>+-		size_t optslen
>+-		char *smtpbuf
>+-		size_t smtplen
>+-		unsigned int interval = NO_INIT
>+-	CODE:
>+-		RETVAL = dkim_policy_getreportinfo(dkim, addrbuf, addrlen, optsbuf, optslen, smtpbuf, smtplen, &interval);
>+-	OUTPUT:
>+-		interval
>+-		RETVAL
>+-
>+ unsigned int
>+ _dkim_sig_getbh(sig)
>+ 		DKIM_SIGINFO *sig
>+@@ -1349,42 +1223,6 @@ _dkim_sig_gettagvalue(sig, keytag, tag)
>+ 	OUTPUT:
>+ 		RETVAL
>+ 
>+-int
>+-_dkim_policy_getdnssec(dkim)
>+-		DKIM *dkim
>+-	CODE:
>+-		RETVAL = dkim_policy_getdnssec(dkim);
>+-	OUTPUT:
>+-		RETVAL
>+-
>+-int
>+-_dkim_policy_syntax(dkim, str, len)
>+-		DKIM *dkim
>+-		unsigned char *str
>+-		size_t len
>+-	CODE:
>+-		RETVAL = dkim_policy_syntax(dkim, str, len);
>+-	OUTPUT:
>+-		RETVAL
>+-
>+-int
>+-_dkim_sig_syntax(dkim, str, len)
>+-		DKIM *dkim
>+-		unsigned char *str
>+-		size_t len
>+-	CODE:
>+-		RETVAL = dkim_policy_syntax(dkim, str, len);
>+-	OUTPUT:
>+-		RETVAL
>+-
>+-int
>+-_dkim_getpresult(dkim)
>+-		DKIM *dkim
>+-	CODE:
>+-		RETVAL = dkim_getpresult(dkim);
>+-	OUTPUT:
>+-		RETVAL
>+-
>+ const char *
>+ _dkim_geterror(dkim)
>+ 		DKIM *dkim
>
>Property changes on: files/patch-OpenDKIM.xs
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

madpilot: maintainer-approval? (vivek)

Actions: View | Diff

Attachments on bug 202056: 159485