diff options
| author | roy <roy@pkgsrc.org> | 2012-12-06 10:48:51 +0000 |
|---|---|---|
| committer | roy <roy@pkgsrc.org> | 2012-12-06 10:48:51 +0000 |
| commit | 0a8c1971ddbdbcd30690812ab7366f5cfbf05017 (patch) | |
| tree | 9924da6150473b842e7a00b4a803d086a12fd370 /mail/dspam | |
| parent | 1a4668d216e22ad70d7f508bf879896292e81fb8 (diff) | |
| download | pkgsrc-0a8c1971ddbdbcd30690812ab7366f5cfbf05017.tar.gz | |
Remove stale patches
Diffstat (limited to 'mail/dspam')
| -rw-r--r-- | mail/dspam/patches/patch-ae | 40 | ||||
| -rw-r--r-- | mail/dspam/patches/patch-ag | 23 |
2 files changed, 0 insertions, 63 deletions
diff --git a/mail/dspam/patches/patch-ae b/mail/dspam/patches/patch-ae deleted file mode 100644 index 1b5bfa549eb..00000000000 --- a/mail/dspam/patches/patch-ae +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2009/03/13 10:11:15 roy Exp $ - -Report the correct driver on error. -Escape the binary string correctly using the thread safe PQescapeByteaConn. -Declare the string as being escaped. -Use strlcpy instead of strcpy. - ---- src/pgsql_drv.c 2006-07-29 14:38:48.000000000 +0100 -+++ src/pgsql_drv.c 2009-03-12 23:19:50.000000000 +0000 -@@ -1146,7 +1146,7 @@ - - p = _pgsql_drv_getpwuid (CTX, uid); - if (!p) { -- LOG(LOG_CRIT, "_ds_get_signature(): _mysql_drv_getpwuid(%d) failed: aborting", uid); -+ LOG(LOG_CRIT, "_ds_get_signature(): _pgsql_drv_getpwuid(%d) failed: aborting", uid); - return EFAILURE; - } - username = strdup(p->pw_name); -@@ -1238,10 +1238,10 @@ - return EUNKNOWN; - } - -- mem = PQescapeBytea(SIG->data, SIG->length, &length); -+ mem = PQescapeByteaConn(s->dbh, SIG->data, SIG->length, &length); - - snprintf (scratch, sizeof (scratch), -- "INSERT INTO dspam_signature_data (uid, signature, length, created_on, data) VALUES (%d, '%s', %ld, CURRENT_DATE, '", -+ "INSERT INTO dspam_signature_data (uid, signature, length, created_on, data) VALUES (%d, '%s', %ld, CURRENT_DATE, E'", - (int)p->pw_uid, signature, SIG->length); - buffer_cat (query, scratch); - buffer_cat (query, (const char *) mem); -@@ -1405,7 +1405,7 @@ - virtual_username, - virtual_table); - #else -- strcpy (query, "DECLARE dscursor CURSOR FOR SELECT DISTINCT uid FROM dspam_stats"); -+ strlcpy (query, "DECLARE dscursor CURSOR FOR SELECT DISTINCT uid FROM dspam_stats", sizeof(query)); - #endif - - result = PQexec(s->dbh, query); diff --git a/mail/dspam/patches/patch-ag b/mail/dspam/patches/patch-ag deleted file mode 100644 index e4f88d55773..00000000000 --- a/mail/dspam/patches/patch-ag +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2009/03/16 18:13:34 adrianp Exp $ - -Add a custom configuration option in dspam.conf of "StripRcptDomain" which, -if selected, strips the RCPT TO domain from email processed through DSPAM. - ---- src/daemon.c.orig 2006-08-03 18:27:00.000000000 +0100 -+++ src/daemon.c 2006-08-03 19:29:22.000000000 +0100 -@@ -571,6 +571,15 @@ - goto GETCMD; - } - -+ /* Chop of @.* from the recipient */ -+ if (_ds_match_attribute(agent_config, "StripRcptDomain", "on")) { -+ strtok(username, "@"); -+ if (username[0] == 0 || username[0] == '-') { -+ daemon_reply(TTX, LMTP_BAD_CMD, "5.1.2", ERR_LMTP_BAD_RCPT); -+ goto GETCMD; -+ } -+ } -+ - if (_ds_match_attribute(agent_config, "Broken", "case")) - lc(username, username); - |