diff options
| author | garga <garga@FreeBSD.org> | 2007-06-02 01:38:38 +0800 |
|---|---|---|
| committer | garga <garga@FreeBSD.org> | 2007-06-02 01:38:38 +0800 |
| commit | 52cfa57eacefad3360ba60c7402d09d0174dd7ab (patch) | |
| tree | f12d23c2e8018c07192de05cbe987b3e21c26413 /mail/qmail | |
| parent | a5b8e2854d0f3f9eb77df97dde90aeb4170ac81a (diff) | |
| download | freebsd-ports-gnome-52cfa57eacefad3360ba60c7402d09d0174dd7ab.tar.gz freebsd-ports-gnome-52cfa57eacefad3360ba60c7402d09d0174dd7ab.tar.zst freebsd-ports-gnome-52cfa57eacefad3360ba60c7402d09d0174dd7ab.zip | |
- Update smtpextfork patch for qmail-spamcontrol:
o Use strncpy instead of strcpy
o Limit memory buffers and fix QUIT_ASAP behavior on SMTP sessions,
which may break some RFCs. Instead, the default behavior now is 100%
RFC complaint. The old QUITASAP behavior, sometimes desired for a
number of users (used to be default behavior on Spamcontrol in the
past) is now a build option (XF_QUITASAP).
Submitted by: Patrick Tracanelli (Author, by email)
Diffstat (limited to 'mail/qmail')
| -rw-r--r-- | mail/qmail/Makefile | 11 | ||||
| -rw-r--r-- | mail/qmail/distinfo | 6 |
2 files changed, 11 insertions, 6 deletions
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index 7304607680ac..5ddd111a3159 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -177,7 +177,8 @@ OPTIONS+= RELAYMAILFROM "Open relay based on mailfrom" off \ VERP "VERP addresses for recipients" on \ MOREIPME "Add control files (more|not)ipme" off \ BIGTODO "Bruce Guenter's BigToDo patch" off \ - SMTPEXTFORK "Allow qmail-smtpd fork external progs" off + SMTPEXTFORK "Allow qmail-smtpd fork external progs" off \ + XF_QUITASAP "Close SMTP session ASAP (SMTPEXTFORK)" off .endif OPTIONS+= QEXTRA "enable QUEUE_EXTRA copy feature" off @@ -463,7 +464,7 @@ PATCHFILES+= tarpit.patch:tarpit .if defined(WITH_SMTPEXTFORK) && defined(SLAVE_SPAMCONTROL) MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:extfork/} MASTER_SITE_SUBDIR+= garga/qmail/:extfork -DISTFILES+= smtpextfork-spamcontrol-${SPAMCONTROL_VERSION}.patch:extfork \ +DISTFILES+= smtpextfork-spamcontrol-${SPAMCONTROL_VERSION}_1.patch:extfork \ README.smtpextfork:extfork .endif @@ -585,7 +586,11 @@ post-patch: @${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/outgoingip.patch-spamcontrol . endif . if defined(WITH_SMTPEXTFORK) - @${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/smtpextfork-spamcontrol-${SPAMCONTROL_VERSION}.patch + @${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/smtpextfork-spamcontrol-${SPAMCONTROL_VERSION}_1.patch +. if defined(WITH_XF_QUITASAP) + @${REINPLACE_CMD} 's!//#define XF_QUITASAP!#define XF_QUITASAP!g' \ + ${WRKSRC}/qmail-smtpd.c +. endif . endif .elif defined(SLAVE_TLS) @${HEAD} -105 ${DISTDIR}/${DIST_SUBDIR}/qmail-1.03-tls-${TLS_PATCH_DATE}-renato.patch > \ diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo index bdb82615d2a3..8a1edd03bd42 100644 --- a/mail/qmail/distinfo +++ b/mail/qmail/distinfo @@ -95,9 +95,9 @@ SIZE (qmail/auth.patch.diff-tls) = 2993 MD5 (qmail/ext_todo-20030105+big-todo.103.patch) = 5878870ef85d6a83ba9465ce94d9cd42 SHA256 (qmail/ext_todo-20030105+big-todo.103.patch) = 4e44ad403b21f5910b6af11295b82296bc8c0f18bc40dcfecfb95c11e5a296f7 SIZE (qmail/ext_todo-20030105+big-todo.103.patch) = 2523 -MD5 (qmail/smtpextfork-spamcontrol-2418.patch) = 54e4d8686a621166b006765c83c14cb0 -SHA256 (qmail/smtpextfork-spamcontrol-2418.patch) = 422b8b37c6e447f1a9ae1ffec8d00aee98bceafa963927c6331480ad90e99563 -SIZE (qmail/smtpextfork-spamcontrol-2418.patch) = 6865 +MD5 (qmail/smtpextfork-spamcontrol-2418_1.patch) = af5b96daaa2021e03712ada45e3b523c +SHA256 (qmail/smtpextfork-spamcontrol-2418_1.patch) = 59c03c8ec28aa32c7869b3b63d9d760712f983fc5b8d9723fddbdb9e95c9f650 +SIZE (qmail/smtpextfork-spamcontrol-2418_1.patch) = 7609 MD5 (qmail/README.smtpextfork) = e783965f5a7510c38b30f0ba3cda1e11 SHA256 (qmail/README.smtpextfork) = c43122d27d4e20dd955c30ca402903d2e9a6a1820c3cf11902e2477316abdcbb SIZE (qmail/README.smtpextfork) = 7618 |