FreeBSD Bugzilla – Attachment 211934 Details for
Bug 244405
mail/py-milter: Update to 1.0.4
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch file
mail_py-milter.patch (text/plain), 9.75 KB, created by
Yasuhiro Kimura
on 2020-02-25 18:10:14 UTC
(
hide
)
Description:
Patch file
Filename:
MIME Type:
Creator:
Yasuhiro Kimura
Created:
2020-02-25 18:10:14 UTC
Size:
9.75 KB
patch
obsolete
>Index: mail/py-milter/Makefile >=================================================================== >--- mail/py-milter/Makefile (revision 527081) >+++ mail/py-milter/Makefile (working copy) >@@ -2,8 +2,7 @@ > # $FreeBSD$ > > PORTNAME= milter >-PORTVERSION= 1.0.2 >-PORTREVISION= 1 >+PORTVERSION= 1.0.4 > DISTVERSIONPREFIX= ${GH_PROJECT}- > CATEGORIES= mail python > PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} >@@ -29,10 +28,4 @@ > post-install: > ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/milter.so > >-.include <bsd.port.pre.mk> >- >-.if ${FLAVOR:Upy36:Mpy3*} >-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-miltermodule.c >-.endif >- >-.include <bsd.port.post.mk> >+.include <bsd.port.mk> >Index: mail/py-milter/distinfo >=================================================================== >--- mail/py-milter/distinfo (revision 527081) >+++ mail/py-milter/distinfo (working copy) >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1528123349 >-SHA256 (sdgathman-pymilter-pymilter-1.0.2_GH0.tar.gz) = f513053f5fc9b0c31d886d8412a411bdc958786a673d7071b1bd521498b01153 >-SIZE (sdgathman-pymilter-pymilter-1.0.2_GH0.tar.gz) = 1022535 >+TIMESTAMP = 1582652875 >+SHA256 (sdgathman-pymilter-pymilter-1.0.4_GH0.tar.gz) = f871e29d2bb4bb192e9d9a1f205278f55cb0092a6c8c84ab698171924e4d2a2c >+SIZE (sdgathman-pymilter-pymilter-1.0.4_GH0.tar.gz) = 1023222 >Index: mail/py-milter/files/extra-patch-miltermodule.c >=================================================================== >--- mail/py-milter/files/extra-patch-miltermodule.c (revision 527081) >+++ mail/py-milter/files/extra-patch-miltermodule.c (nonexistent) >@@ -1,172 +0,0 @@ >---- miltermodule.c.orig 2016-12-13 19:17:34 UTC >-+++ miltermodule.c >-@@ -343,7 +343,7 @@ static struct MilterCallback { >- { NULL , NULL } >- }; >- >--staticforward struct smfiDesc description; /* forward declaration */ >-+static struct smfiDesc description; /* forward declaration */ >- >- static PyObject *MilterError; >- /* The interpreter instance that called milter.main */ >-@@ -355,7 +355,7 @@ typedef struct { >- >- static milter_Diag diag; >- >--staticforward PyTypeObject milter_ContextType; >-+static PyTypeObject milter_ContextType; >- >- typedef struct { >- PyObject_HEAD >-@@ -700,7 +700,7 @@ _generic_wrapper(milter_ContextObject *s >- result = PyEval_CallObject(cb, arglist); >- Py_DECREF(arglist); >- if (result == NULL) return _report_exception(self); >-- if (!PyInt_Check(result)) { >-+ if (!PyLong_Check(result)) { >- const struct MilterCallback *p; >- const char *cbname = "milter"; >- char buf[40]; >-@@ -715,7 +715,7 @@ _generic_wrapper(milter_ContextObject *s >- PyErr_SetString(MilterError,buf); >- return _report_exception(self); >- } >-- retval = PyInt_AS_LONG(result); >-+ retval = PyLong_AS_LONG(result); >- Py_DECREF(result); >- _release_thread(self->t); >- return retval; >-@@ -732,7 +732,7 @@ makeipaddr(struct sockaddr_in *addr) { >- sprintf(buf, "%d.%d.%d.%d", >- (int) (x>>24) & 0xff, (int) (x>>16) & 0xff, >- (int) (x>> 8) & 0xff, (int) (x>> 0) & 0xff); >-- return PyString_FromString(buf); >-+ return PyUnicode_FromString(buf); >- } >- >- #ifdef HAVE_IPV6_SUPPORT >-@@ -740,8 +740,8 @@ static PyObject * >- makeip6addr(struct sockaddr_in6 *addr) { >- char buf[100]; /* must be at least INET6_ADDRSTRLEN + 1 */ >- const char *s = inet_ntop(AF_INET6, &addr->sin6_addr, buf, sizeof buf); >-- if (s) return PyString_FromString(s); >-- return PyString_FromString("inet6:unknown"); >-+ if (s) return PyUnicode_FromString(s); >-+ return PyUnicode_FromString("inet6:unknown"); >- } >- #endif >- >-@@ -832,7 +832,7 @@ generic_env_wrapper(SMFICTX *ctx, PyObje >- for (i=0;i<count;i++) { >- /* There's some error checking performed in do_mkvalue() for a string */ >- /* that's not currently done here - it probably should be */ >-- PyObject *o = PyString_FromStringAndSize(argv[i], strlen(argv[i])); >-+ PyObject *o = PyUnicode_FromStringAndSize(argv[i], strlen(argv[i])); >- if (o == NULL) { /* out of memory */ >- Py_DECREF(arglist); >- return _report_exception(self); >-@@ -889,7 +889,7 @@ milter_wrap_body(SMFICTX *ctx, u_char *b >- c = _get_context(ctx); >- if (!c) return SMFIS_TEMPFAIL; >- /* Unclear whether this should be s#, z#, or t# */ >-- arglist = Py_BuildValue("(Os#)", c, bodyp, bodylen); >-+ arglist = Py_BuildValue("(Oy#)", c, bodyp, bodylen); >- return _generic_wrapper(c, body_callback, arglist); >- } >- >-@@ -963,7 +963,7 @@ milter_wrap_negotiate(SMFICTX *ctx, >- int i; >- for (i = 0; i < 4; ++i) { >- *pa[i] = (i <= len) >-- ? PyInt_AsUnsignedLongMask(PyList_GET_ITEM(optlist,i)) >-+ ? PyLong_AsUnsignedLongMask(PyList_GET_ITEM(optlist,i)) >- : fa[i]; >- } >- if (PyErr_Occurred()) { >-@@ -1551,11 +1551,6 @@ static PyMethodDef context_methods[] = { >- { NULL, NULL } >- }; >- >--static PyObject * >--milter_Context_getattr(PyObject *self, char *name) { >-- return Py_FindMethod(context_methods, self, name); >--} >-- >- static struct smfiDesc description = { /* Set some reasonable defaults */ >- "pythonfilter", >- SMFI_VERSION, >-@@ -1604,14 +1599,13 @@ static PyMethodDef milter_methods[] = { >- }; >- >- static PyTypeObject milter_ContextType = { >-- PyObject_HEAD_INIT(&PyType_Type) >-- 0, >-- "milterContext", >-+ PyVarObject_HEAD_INIT(&PyType_Type,0) >-+ "milter.Context", >- sizeof(milter_ContextObject), >- 0, >- milter_Context_dealloc, /* tp_dealloc */ >- 0, /* tp_print */ >-- milter_Context_getattr, /* tp_getattr */ >-+ 0, /* tp_getattr */ >- 0, /* tp_setattr */ >- 0, /* tp_compare */ >- 0, /* tp_repr */ >-@@ -1625,6 +1619,13 @@ static PyTypeObject milter_ContextType = >- 0, /* tp_setattro */ >- 0, /* tp_as_buffer */ >- Py_TPFLAGS_DEFAULT, /* tp_flags */ >-+ NULL, /* Documentation string */ >-+ 0, /* call function for all accessible objects */ >-+ 0, /* delete references to contained objects */ >-+ 0, /* rich comparisons */ >-+ 0, /* weak reference enabler */ >-+ 0, 0, /* Iterators */ >-+ context_methods, /* Attribute descriptor and subclassing stuff */ >- }; >- >- static const char milter_documentation[] = >-@@ -1634,17 +1635,31 @@ Libmilter is currently marked FFR, and n >- See <sendmailsource>/libmilter/README for details on setting it up.\n"; >- >- static void setitem(PyObject *d,const char *name,long val) { >-- PyObject *v = PyInt_FromLong(val); >-+ PyObject *v = PyLong_FromLong(val); >- PyDict_SetItemString(d,name,v); >- Py_DECREF(v); >- } >- >--void >--initmilter(void) { >-+static struct PyModuleDef moduledef = { >-+ PyModuleDef_HEAD_INIT, >-+ "milter", /* m_name */ >-+ milter_documentation,/* m_doc */ >-+ -1, /* m_size */ >-+ milter_methods, /* m_methods */ >-+ NULL, /* m_reload */ >-+ NULL, /* m_traverse */ >-+ NULL, /* m_clear */ >-+ NULL, /* m_free */ >-+}; >-+ >-+PyMODINIT_FUNC PyInit_milter(void) { >- PyObject *m, *d; >- >-- m = Py_InitModule4("milter", milter_methods, milter_documentation, >-- (PyObject*)NULL, PYTHON_API_VERSION); >-+ if (PyType_Ready(&milter_ContextType) < 0) >-+ return NULL; >-+ >-+ m = PyModule_Create(&moduledef); >-+ if (m == NULL) return NULL; >- d = PyModule_GetDict(m); >- MilterError = PyErr_NewException("milter.error", NULL, NULL); >- PyDict_SetItemString(d,"error", MilterError); >-@@ -1710,4 +1725,5 @@ initmilter(void) { >- setitem(d,"DISCARD", SMFIS_DISCARD); >- setitem(d,"ACCEPT", SMFIS_ACCEPT); >- setitem(d,"TEMPFAIL", SMFIS_TEMPFAIL); >-+ return m; >- } >Index: mail/py-milter/files/patch-Milter-dns.py >=================================================================== >--- mail/py-milter/files/patch-Milter-dns.py (revision 527081) >+++ mail/py-milter/files/patch-Milter-dns.py (nonexistent) >@@ -1,13 +0,0 @@ >---- Milter/dns.py.orig 2016-12-13 19:17:34 UTC >-+++ Milter/dns.py >-@@ -26,8 +26,8 @@ def DNSLookup(name, qtype): >- # A RR as dotted quad. For consistency, this driver should >- # return both as binary string. >- return [((a['name'], a['typename']), a['data']) for a in resp.answers] >-- except IOError, x: >-- raise DNSError, str(x) >-+ except IOError as x: >-+ raise DNSError(str(x)) >- >- class Session(object): >- """A Session object has a simple cache with no TTL that is valid >Index: mail/py-milter/files/patch-Milter-dsn.py >=================================================================== >--- mail/py-milter/files/patch-Milter-dsn.py (revision 527081) >+++ mail/py-milter/files/patch-Milter-dsn.py (nonexistent) >@@ -1,19 +0,0 @@ >---- Milter/dsn.py.orig 2016-12-13 19:17:34 UTC >-+++ Milter/dsn.py >-@@ -142,13 +142,13 @@ def send_dsn(mailfrom,receiver,msg=None, >- if badrcpts: >- return badrcpts >- return None # success >-- except smtplib.SMTPRecipientsRefused,x: >-+ except smtplib.SMTPRecipientsRefused as x: >- if len(x.recipients) == 1: >- return x.recipients.values()[0] # permanent error >- return x.recipients >-- except smtplib.SMTPSenderRefused,x: >-+ except smtplib.SMTPSenderRefused as x: >- return x.args[:2] # does not accept DSN >-- except smtplib.SMTPDataError,x: >-+ except smtplib.SMTPDataError as x: >- return x.args # permanent error >- except smtplib.SMTPException: >- pass # any other error, try next MX >Index: mail/py-milter/pkg-descr >=================================================================== >--- mail/py-milter/pkg-descr (revision 527081) >+++ mail/py-milter/pkg-descr (working copy) >@@ -2,4 +2,4 @@ > sendmail's libmilter functionality. Additional python modules provide for > navigating and modifying MIME parts, and sending DSNs or doing CBVs. > >-WWW: http://www.bmsi.com/python/milter.html >+WWW: https://pythonhosted.org/milter/
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=211934">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 244405
: 211934