summaryrefslogtreecommitdiff
path: root/mail/clamav
diff options
context:
space:
mode:
authorgrant <grant>2004-10-30 12:34:51 +0000
committergrant <grant>2004-10-30 12:34:51 +0000
commit50301f041eecf7622eed66b824fbc4453a07f580 (patch)
tree585d8b42a1ed3fb9863af48f621633af825d5f11 /mail/clamav
parent1bc05f7c44be57f4c228918387df47d5ce439ed6 (diff)
downloadpkgsrc-50301f041eecf7622eed66b824fbc4453a07f580.tar.gz
apply patch from Koji Mori in PR pkg/27337 to fix bad fprintf()
format string.
Diffstat (limited to 'mail/clamav')
-rw-r--r--mail/clamav/distinfo3
-rw-r--r--mail/clamav/patches/patch-ah31
2 files changed, 33 insertions, 1 deletions
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index 59c524f96b7..41aa2c430d9 100644
--- a/mail/clamav/distinfo
+++ b/mail/clamav/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2004/10/30 09:50:33 xtraeme Exp $
+$NetBSD: distinfo,v 1.20 2004/10/30 12:34:51 grant Exp $
SHA1 (clamav-0.80.tar.gz) = 0f050a19c514d2bab6063c983f155fb891c7155f
Size (clamav-0.80.tar.gz) = 2679434 bytes
@@ -6,3 +6,4 @@ SHA1 (patch-aa) = 17c713c3b5833f895b7caa470ae31f3d45d60643
SHA1 (patch-ad) = 39ce91421e9baf128817830b34e196a5275e208e
SHA1 (patch-af) = 605728b133ddb95827285d06bfeec9400222f874
SHA1 (patch-ag) = 3f3154077961527ad6afa9574091fb743f2c50ab
+SHA1 (patch-ah) = f033a0fc7ce1a81fc7983954397e942724f174cc
diff --git a/mail/clamav/patches/patch-ah b/mail/clamav/patches/patch-ah
new file mode 100644
index 00000000000..0ed9e7670fc
--- /dev/null
+++ b/mail/clamav/patches/patch-ah
@@ -0,0 +1,31 @@
+$NetBSD: patch-ah,v 1.1 2004/10/30 12:34:51 grant Exp $
+
+--- clamav-milter/clamav-milter.c.orig 2004-10-11 10:59:12.000000000 +1000
++++ clamav-milter/clamav-milter.c
+@@ -2691,7 +2691,7 @@ clamfi_eom(SMFICTX *ctx)
+ * the postmaster, so include
+ * some useful information
+ */
+- fprintf(sendmail, _("The message %1$s sent from %2$s to\n"),
++ fprintf(sendmail, _("The message %s sent from %s to\n"),
+ sendmailId, sender);
+ else
+ fprintf(sendmail, _("A message sent from %s to\n"),
+@@ -2706,7 +2706,7 @@ clamfi_eom(SMFICTX *ctx)
+ fprintf(sendmail, _("\nThe message in question has been quarantined as %s\n"), privdata->filename);
+
+ if(hflag) {
+- fprintf(sendmail, _("\nThe message was received by %1$s from %2$s via %3$s\n\n"),
++ fprintf(sendmail, _("\nThe message was received by %s from %s via %s\n\n"),
+ smfi_getsymval(ctx, "j"), sender,
+ smfi_getsymval(ctx, "_"));
+ fputs(_("For your information, the original message headers were:\n\n"), sendmail);
+@@ -3697,7 +3697,7 @@ qfile(struct privdata *privdata, const c
+ if(link(privdata->filename, newname) < 0) {
+ perror(newname);
+ if(use_syslog)
+- syslog(LOG_WARNING, _("Can't rename %1$s to %2$s"),
++ syslog(LOG_WARNING, _("Can't rename %s to %s"),
+ privdata->filename, newname);
+ free(newname);
+ return -1;