diff options
| author | bouyer <bouyer> | 2010-10-28 20:11:18 +0000 |
|---|---|---|
| committer | bouyer <bouyer> | 2010-10-28 20:11:18 +0000 |
| commit | bbe6a0722662eea30e16bd09539ef5f44bb113a8 (patch) | |
| tree | 96b7a37bb421cd9fa06ffb7c28068b4dfab896dd | |
| parent | c18c50d48ed760820692f29321121774e02fc5d6 (diff) | |
| download | pkgsrc-bbe6a0722662eea30e16bd09539ef5f44bb113a8.tar.gz | |
backport 2 fixes from the git repository. Without it, clamav would
fail to parse some PDF files. Bump PKGREVISION.
| -rw-r--r-- | mail/clamav/Makefile | 3 | ||||
| -rw-r--r-- | mail/clamav/distinfo | 3 | ||||
| -rw-r--r-- | mail/clamav/patches/patch-ah | 31 |
3 files changed, 35 insertions, 2 deletions
diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile index e1ff3d80536..5e11c396fe7 100644 --- a/mail/clamav/Makefile +++ b/mail/clamav/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.106 2010/10/26 06:38:36 adam Exp $ +# $NetBSD: Makefile,v 1.107 2010/10/28 20:11:18 bouyer Exp $ DISTNAME= clamav-${CLAMAV_VERSION} PKGNAME= clamav-${CLAMAV_VERSION:S/-/./} +PKGREVISION= 1 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clamav/} diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo index ac02576c547..a4cf4833ccc 100644 --- a/mail/clamav/distinfo +++ b/mail/clamav/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.68 2010/10/26 06:38:37 adam Exp $ +$NetBSD: distinfo,v 1.69 2010/10/28 20:11:18 bouyer Exp $ SHA1 (clamav-0.96.4.tar.gz) = ffff540b330f3d33c9ff9e8d551763b4e0028d72 RMD160 (clamav-0.96.4.tar.gz) = c12a7a09b2bef06b48596a159f3bcae5b12e61dc @@ -9,3 +9,4 @@ SHA1 (patch-ac) = af6c04bdeff91dec5e672f84fea6bd18d4e2fa1d SHA1 (patch-ad) = 7d7ea5f8cda22dca1a399ee1219f1f072d8a3eed SHA1 (patch-af) = a58e2c484b34bbfccb62d6fdf35b552a15dc9bd3 SHA1 (patch-ag) = cf4a0040a53c81402e8d15478407bc854af6fb30 +SHA1 (patch-ah) = a4a6e666f892d65c90ac3e6fe219b3b5fb47e34d diff --git a/mail/clamav/patches/patch-ah b/mail/clamav/patches/patch-ah new file mode 100644 index 00000000000..24753dc2b53 --- /dev/null +++ b/mail/clamav/patches/patch-ah @@ -0,0 +1,31 @@ +$NetBSD: patch-ah,v 1.19 2010/10/28 20:11:18 bouyer Exp $ + +Fix "Unknown error code ERROR" on some PDF. Will be in 0.96.4: +http://git.clamav.net/gitweb?p=clamav-devel.git;a=commitdiff;h=e142504b07d7f81435f6ac99ec1eedf6c08f2188 + +Fix "LibClamAV Error: cli_pdf: mmap() failed (2)" on some PDF. +Will be in 0.96.4: +http://git.clamav.net/gitweb?p=clamav-devel.git;a=commitdiff;h=8f6bf9fc080aa54badcd7608f253821d5a8b1786 + +diff --git a/libclamav/pdf.c b/libclamav/pdf.c +index cd4d25a..e242135 100644 (file) +--- libclamav/pdf.c.orig 2010-09-20 15:24:46.000000000 +0200 ++++ libclamav/pdf.c 2010-10-23 16:46:49.000000000 +0200 +@@ -1024,7 +1024,7 @@ int cli_pdf(const char *dir, cli_ctx *ctx, off_t offset) + offset += pdfver - start; + + /* find trailer and xref, don't fail if not found */ +- map_off = map->len - 2048; ++ map_off = (off_t)map->len - 2048; + if (map_off < 0) + map_off = 0; + bytesleft = map->len - map_off; +@@ -1087,7 +1087,7 @@ + rc = run_pdf_hooks(&pdf, PDF_PHASE_PRE, -1, -1); + if (rc) { + cli_dbgmsg("cli_pdf: returning %d\n", rc); +- return rc; ++ return rc == CL_BREAK ? CL_CLEAN : rc; + } + /* parse PDF and find obj offsets */ + while ((rc = pdf_findobj(&pdf)) > 0) { |