diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2014-11-29 00:17:05 +0000 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2014-11-29 00:17:05 +0000 |
commit | c443f298184e20d210f003c32432a99ab15c2ba3 (patch) | |
tree | 1f533478da55f2f327ab9fda00692a8f378b4b58 /mail-filter | |
parent | Version bump (bug #520088) and add myself as primary maintainer. (diff) | |
download | gentoo-2-c443f298184e20d210f003c32432a99ab15c2ba3.tar.gz gentoo-2-c443f298184e20d210f003c32432a99ab15c2ba3.tar.bz2 gentoo-2-c443f298184e20d210f003c32432a99ab15c2ba3.zip |
Remove
Diffstat (limited to 'mail-filter')
12 files changed, 0 insertions, 646 deletions
diff --git a/mail-filter/spamassassin-fuzzyocr/ChangeLog b/mail-filter/spamassassin-fuzzyocr/ChangeLog deleted file mode 100644 index c629c09f6f59..000000000000 --- a/mail-filter/spamassassin-fuzzyocr/ChangeLog +++ /dev/null @@ -1,140 +0,0 @@ -# ChangeLog for mail-filter/spamassassin-fuzzyocr -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-fuzzyocr/ChangeLog,v 1.29 2014/11/09 22:20:01 dilfridge Exp $ - - 09 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org> - spamassassin-fuzzyocr-3.6.0-r2.ebuild: - Replace perlinfo with perl_set_version - - 04 Aug 2014; Mikle Kolyada <zlogene@gentoo.org> - spamassassin-fuzzyocr-3.6.0-r2.ebuild: - Bump to EAPI=5 - - 04 Aug 2014; Mikle Kolyada <zlogene@gentoo.org> - -spamassassin-fuzzyocr-3.6.0.ebuild: - Drop old - - 21 Jan 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml: - Cleanup as talked with him - - 05 Jun 2012; Zac Medico <zmedico@gentoo.org> - spamassassin-fuzzyocr-3.6.0-r2.ebuild, spamassassin-fuzzyocr-3.6.0.ebuild: - inherit user for enewgroup - - 09 Nov 2010; Bernard Cafarelli <voyageur@gentoo.org> metadata.xml: - Remove myself from maintainers - - 30 Jul 2010; Bernard Cafarelli <voyageur@gentoo.org> - spamassassin-fuzzyocr-3.6.0-r2.ebuild, - +files/spamassassin-fuzzyocr-3.6.0-fix_tesseract.patch: - Fix tesseract support with tiff images, bug #330461 - -*spamassassin-fuzzyocr-3.6.0-r2 (29 Jul 2010) - - 29 Jul 2010; Bernard Cafarelli <voyageur@gentoo.org> - -spamassassin-fuzzyocr-3.6.0-r1.ebuild, - +spamassassin-fuzzyocr-3.6.0-r2.ebuild, - files/spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch: - Update untaint patch, hope this finally fixes bug #313633 - -*spamassassin-fuzzyocr-3.6.0-r1 (19 May 2010) - - 19 May 2010; Bernard Cafarelli <voyageur@gentoo.org> - +spamassassin-fuzzyocr-3.6.0-r1.ebuild, - +files/spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch: - Apply patch from Debian to untaint ocr helpers, bug #313633 - - 26 Apr 2010; Bernard Cafarelli <voyageur@gentoo.org> - -spamassassin-fuzzyocr-2.3b.ebuild, -spamassassin-fuzzyocr-3.5.1.ebuild, - -spamassassin-fuzzyocr-3.5.1-r1.ebuild: - Drop old versions, they do not work with current in-tree SA - - 26 Apr 2010; Markus Meier <maekke@gentoo.org> - spamassassin-fuzzyocr-3.6.0.ebuild: - x86 stable, bug #314733 - -*spamassassin-fuzzyocr-3.6.0 (13 Nov 2009) - - 13 Nov 2009; Bernard Cafarelli <voyageur@gentoo.org> - +spamassassin-fuzzyocr-3.6.0.ebuild, - +files/spamassassin-fuzzyocr-3.6.0-fix_falsepositives.patch, - +files/spamassassin-fuzzyocr-3.6.0-fix_tmpdir.patch, metadata.xml: - Version bump (bug #285327) and add myself to maintainers, patches from - bugs #174993, #273183 (both merged in #251687), default to ocrad ocr - engine if none are specified (bugs #171376, #254751), RDEPEND on netpbm - with jpeg,png,tiff (bug #244828). Also fixes bug #249668 - - 23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml: - add GLEP 56 USE flag desc from use.local.desc - - 02 Aug 2008; Torsten Veller <tove@gentoo.org> - spamassassin-fuzzyocr-3.5.1.ebuild, spamassassin-fuzzyocr-3.5.1-r1.ebuild: - Move perl-core/DB_File -> virtual/perl-DB_File, perl-core/Storable -> - virtual/perl-Storable, perl-core/Time-HiRes -> virtual/perl-Time-HiRes - (#211629) - - 03 Jul 2007; Raúl Porcel <armin76@gentoo.org> - spamassassin-fuzzyocr-3.5.1-r1.ebuild: - Add ~alpha wrt #182519 - - 27 Jun 2007; Lars Weiler <pylon@gentoo.org> - spamassassin-fuzzyocr-3.5.1-r1.ebuild: - Added ~ppc; bug #182519. - - 20 Jun 2007; Markus Rothe <corsair@gentoo.org> - spamassassin-fuzzyocr-3.5.1-r1.ebuild: - Added ~ppc64; bug #182519 - -*spamassassin-fuzzyocr-3.5.1-r1 (18 Jun 2007) - - 18 Jun 2007; Michael Cummings <mcummings@gentoo.org> - +spamassassin-fuzzyocr-3.5.1-r1.ebuild: - bug 177224 - - 03 Jun 2007; Raúl Porcel <armin76@gentoo.org> - spamassassin-fuzzyocr-3.5.1.ebuild: - Add ~alpha wrt #173114 - - 29 Mar 2007; Andrej Kacian <ticho@gentoo.org> - spamassassin-fuzzyocr-2.3b.ebuild: - Stable on x86. - - 25 Mar 2007; Tobias Scherbaum <dertobi123@gentoo.org> - spamassassin-fuzzyocr-3.5.1.ebuild: - Added ~ppc, #170840 - - 18 Mar 2007; Marius Mauch <genone@gentoo.org> - spamassassin-fuzzyocr-2.3b.ebuild, spamassassin-fuzzyocr-3.5.1.ebuild: - Replacing einfo with elog - - 15 Mar 2007; Markus Rothe <corsair@gentoo.org> - spamassassin-fuzzyocr-3.5.1.ebuild: - Stable on ppc64; bug #170840 - - 13 Mar 2007; Tom Knight <tomk@gentoo.org> files/disableocrad.patch, - files/enabletesseract.patch: - Fixed conflicting patches - -*spamassassin-fuzzyocr-3.5.1 (11 Mar 2007) - - 11 Mar 2007; Tom Knight <tomk@gentoo.org> +files/disablegocr.patch, - +files/disableocrad.patch, +files/enabletesseract.patch, - +files/fuzzyocr.logrotate, +spamassassin-fuzzyocr-3.5.1.ebuild: - Version bump to 3.5.1, thanks to everyone who helped out. Fixes bug #158445 - - 08 Feb 2007; Patrick McLean <chutzpah@gentoo.org> metadata.xml: - Add myself as co-maintainer. - - 12 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org> - spamassassin-fuzzyocr-2.3b.ebuild: - Keyworded ~sparc - - 08 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> - spamassassin-fuzzyocr-2.3b.ebuild: - Added ~x86. - -*spamassassin-fuzzyocr-2.3b (05 Dec 2006) - - 05 Dec 2006; Tom Knight <tomk@gentoo.org> +metadata.xml, - +spamassassin-fuzzyocr-2.3b.ebuild: - Initial import. Fixes bug #154392 diff --git a/mail-filter/spamassassin-fuzzyocr/Manifest b/mail-filter/spamassassin-fuzzyocr/Manifest deleted file mode 100644 index b74de48a7dd5..000000000000 --- a/mail-filter/spamassassin-fuzzyocr/Manifest +++ /dev/null @@ -1,34 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX disablegocr.patch 574 SHA256 71914e653efba7688f2edeb396c5ff99d98e42d3541190095041d17549f5812b SHA512 5907fe342af98fd19d134d1f56bca6852d757ee9154cb376116399e275debff4188e53d9378d188d992dcf00d155ff1fe4f2d09c44d812bb914dbc2a8edf54da WHIRLPOOL 9f87787aaa3c84a7adf3e3abbe43465d1adf8a568a98336efa8631c82faec5867c6b64ca6918a81c956c1619f5f5a3fbb8d29b2c143fd31c9eec5f49c95c651e -AUX disableocrad.patch 1165 SHA256 93020dacb93ba6c462db685dfa9db79ffe28c155ab231b56aa538d544f9f5aa5 SHA512 03d73b8d0073942d47e414c0e8c8fc87fcf812a991a95e9d23e86a7a14847d6459e7a649e27ebe51a06f9ee27d6917b50cab332053f8b70a3abbe8637ab02aec WHIRLPOOL 728640ee23f1c2ae3cc832995123608f2ea42247617d9ed1c742059aafadc56e6ec61ea2161a1028f0f212541fff2def86c57e3c9c7c848a6aa349698f90e02f -AUX enabletesseract.patch 656 SHA256 e988dc3fbdf6250fbdd34f8933ffc3f9304e5bb428bb3a1de49a0ce87cab8b90 SHA512 0ec18ea537d576047e6891565d4966cb8c1757614cfa6cc2979c31c8b00e7a890b299ddbcebb25055662978ac23cc77c9a08b81b18c361426800241fcc547854 WHIRLPOOL e10b8ebf1c089f3d8f197d914ad10e9a36ca38675cdca459e697bd7ec2813158eacab67ec8b645fc5d4fafbec82b1c74b2ee3ce8c183cd78fc44bfe9ee2164e0 -AUX fuzzyocr.logrotate 318 SHA256 22a03bf34157324ef7a0df2c539c526b71b649e5184f40461e4b36091cd8bf54 SHA512 47b5c0865ad6d65c6e96dad023a5538029f2ff6fd5b047b8a03bdf5340ec094eaea4879ed7526ddce10e4371134ed77edaccbb73f3ab6bcb062e9d941910bac0 WHIRLPOOL a72844b6bec38c8527674b8c5c7a6b06303f7642b6c1c8a43a94fe03069bcabdd0c095f338866639122f487c22170a9fc0cc60273c95ddf5d099726986f7d6c3 -AUX spamassassin-fuzzyocr-3.6.0-fix_falsepositives.patch 509 SHA256 68066c3b509d55b62877c6b02a83688a0336eaa06200d8370a6064d136839cb9 SHA512 facaddd7beeaa80cd7e24b925ae183ac2123f1817ecb609937f6eba3cfe49a90098ff52cce1d493dd9a0a7c1e01b1beff5ae87d2ccf4a8320ce09db52c33fc5b WHIRLPOOL 4c74c6f070cdb22522f4cac24af524bedb806fda9b2988d194dd21481e4248dcaa48765b8088c9d533087c25cf3a05286d539aa126add6d7434a7a2df95e512a -AUX spamassassin-fuzzyocr-3.6.0-fix_tesseract.patch 1054 SHA256 af1095f8a885eadd46d28e59cc8a4c279d68377fcd1dcd2236dfd0bd79960853 SHA512 3a687000782795b1b9eca23da91ea93aa6807e4c10c1d454eac1364880714f5f4efbf2f94ecdd5af2256bcd11efd9ed6008ba9e6f25eeac519ba641ac827fecd WHIRLPOOL b78a1ea333530bebb17114bb9dc23d6d70c2f04ca652419783950569e6f82b1aba5909f1f7fd2500cf049c0f87e598b9129f7335f1ba8c59f613547dea1123ba -AUX spamassassin-fuzzyocr-3.6.0-fix_tmpdir.patch 2104 SHA256 987dadbcd0e85417d363afdd9f8b78baf53b237f2ead34e54d30908cae9d0167 SHA512 a90021f34362c2b901d6655c20f7683b5b77385fd1390c789019b233471753cd595d370c50cbe38f5d1820ac1f6bb1a743c0b1d7cdbc32feaae0b97ce86f48e7 WHIRLPOOL 2b3af9ea9d434c7fedbd418c6dc2d084b4de48a0378c87bc6ee64f3e592d74dedab3c604940eb36f1b223eb380215b5f0cbf9b61bd76d088398d4712bb152cc1 -AUX spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch 1771 SHA256 49a90c5be418909232055e73913eb21db3a8d5a4cb1a86c7004611c23dc510b2 SHA512 6d530de0dcdaab4bec60eeb3b4e56e6d491875c3898a9d93a48393828a3de7a6499a71e56d38f8d478518bf7688a7d5b3570d7fa88f75c3b4eacd573b2c8af91 WHIRLPOOL 94f909ea551d55e8e9eb4b3a9edccdf263d79c957bd6c136ffc31232f689ec55d33521bfa00dc68c551ee0be97daf016bd8f5aec848198fd24a79f12852cdf93 -DIST fuzzyocr-3.6.0.tar.gz 127103 SHA256 dd345c9500c3c3cdc33503863fe234bf3c2720c54b303e6cbc94dbe8aaf3a218 SHA512 f863cba997dc86fcb7416799c0bd7e9e1ed261e01d7e4274560ce9777b257da7ca4407ab21d8c485707be7e8e353795586830b34881e52309518ff46dd7549cc WHIRLPOOL bddbbbbc201667407cb6eb60a4ef395fd91bccc3cd804fbc65807d2bfa3c1672f8d08779f7cf3fc79b3c5215c324f939573b2c1162226a6dfe0dc6f4d0a688f3 -EBUILD spamassassin-fuzzyocr-3.6.0-r2.ebuild 5534 SHA256 7f5530c3a12ca09810bc6017c82367fc2400e34d2f76c0fd9213abc583474ca6 SHA512 7a32d34d3bf1842db51e50f6346dc315f5b36fd29d6521dd09f5f63a81bdfe78d780771e0cf813a50cad90c2adf3b6e912dc3f82aee350141c1d59ba23bc225b WHIRLPOOL 4192084535cee784c96afefc86fe575bddd4c3db997fcb7505bb513311c93a260293c939e4d82e5f20f57ebde4527b541c8e351c776c6c0e835d626e310fa1db -MISC ChangeLog 5070 SHA256 3f5bfd6e9d8e1fdbfec1fb590f4b2d1d2ae30d5f6cd425564ff4156f62ee6c9c SHA512 dc3356986b755f3a5e39d6eaaac6a1cf66c6ef1b272ccf600841b6647cbe5c1a19e2986f48540327b327b61b2f24b213a068ccee8bea9a87284b4baf3717c582 WHIRLPOOL d626973d121e927a427e523e1e59fd64a98ea9f9b593248a3f2f21c58d5e12756c201a324d3ac6bd2aed7796cc74d28a0d39df69a48f1d3c828cfb6805ce384e -MISC metadata.xml 1030 SHA256 3d5a2e27157d43b4ece4bcde12fd06aaaa11a724b2167cb8f2cb029c78f5b388 SHA512 3ad0bd3d8bde6bca715335e8ec4d17c674d78eddf54edf12b1a8c67007b0584f202d4442ef741c7be7d6047a16389e4be9e5eea074bedd7ca30fedc6183ec471 WHIRLPOOL 5ed06bcd1208163cc893a78b4f2394ebfc2046b011b37a47b30e24dd8b9f8b2d24c912be95f044825c66d5a16bcc674a0228397f5c6df256fac6135df2fdeac8 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 - -iQJ8BAEBCABmBQJUX+iSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF -QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcsTwP/3j+z0Q2zbBQvJSszJYfYDia -fK1VIkfFr8/Ii62qa6b4OnXyhy9j15UXbEiF75mlBOYUr0mpQiJbTzfW4QjzNqAI -pq43YuapsRzRoxtOAPVcTLR2ruRK7FYKr4DE5mLpSJvaqBOWj+vs+uAJ2MBRqgBj -d6aqZqp6hsT1YiIWxUIkaNuy2dSGHgMBwyIAiaayzj/vUgrvW6EkrX6zHHInSZHh -XQd2RBsEJjlKSaTDf2Qg4YICoIpErq8ho7iMS+5gr416OFYnE0JvZnFu0RJwGkKS -jPnHVSWMr30tbR3TGeQatwJluQL2aiCZm5WMas16uFdi37YpJv38mAMt2PfWzmhT -p+iw5e3Hbw2YpO/D0YREVHw+8vs+S3Ifnr1ijyEOXu+uX54XvfrzCEcnhTiN3bKg -k1hxAHuk+5K1W2FFxBRkW81mVIkQI2aV63f2sNEwpBT921u0hMm7Xt+PVpwC5bon -+ZQ3M28UB7Clz3sYT5avBjI7at70wBfycP+urn/Xr6jcwBy70ccqcPUuSpfN9Rh2 -REk0X57Am75nMd2ez4QDcES64It/GxuoH2rfVgU5lh/Tq3qJMtip5HroaNwxDT74 -i3Y8Ou6KzIGXsJS8FiGQNVxnsVgJT32hx0xPjXaaubZABRXoWa39ypxRvx20TvMA -jrE8ABuThM70nqEcjSVk -=r3zf ------END PGP SIGNATURE----- diff --git a/mail-filter/spamassassin-fuzzyocr/files/disablegocr.patch b/mail-filter/spamassassin-fuzzyocr/files/disablegocr.patch deleted file mode 100644 index acaf07ce14cd..000000000000 --- a/mail-filter/spamassassin-fuzzyocr/files/disablegocr.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- FuzzyOcr.scansets.orig 2006-12-26 16:08:25.000000000 -0800 -+++ FuzzyOcr.scansets 2006-12-26 16:12:09.000000000 -0800 -@@ -33,16 +33,16 @@ - } - - # Standard Gocr Scanset --scanset gocr { -- command = $gocr -- args = -i $input --} -+#scanset gocr { -+# command = $gocr -+# args = -i $input -+#} - - # Tweaked Gocr Scanset --scanset gocr-180 { -- command = $gocr -- args = -l 180 -d 2 -i $input --} -+#scanset gocr-180 { -+# command = $gocr -+# args = -l 180 -d 2 -i $input -+#} - - # An example Scanset how to use tesseract (disabled by default) - #scanset tesseract { diff --git a/mail-filter/spamassassin-fuzzyocr/files/disableocrad.patch b/mail-filter/spamassassin-fuzzyocr/files/disableocrad.patch deleted file mode 100644 index cda344a6513e..000000000000 --- a/mail-filter/spamassassin-fuzzyocr/files/disableocrad.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- FuzzyOcr.scansets.orig 2006-12-26 23:45:35.000000000 +0100 -+++ FuzzyOcr.scansets 2006-12-26 23:45:55.000000000 +0100 -@@ -7,30 +7,30 @@ - - - # Standard Ocrad Scanset --scanset ocrad { -- command = $ocrad -- args = -s5 $input --} -+#scanset ocrad { -+# command = $ocrad -+# args = -s5 $input -+#} - - # Inverted Ocrad scanset --scanset ocrad-invert { -- command = $ocrad -- args = -s5 -i $input --} -+#scanset ocrad-invert { -+# command = $ocrad -+# args = -s5 -i $input -+#} - - # Inverted Ocrad scanset with decolorization --scanset ocrad-decolorize-invert { -- preprocessors = ppmtopgm, pamthreshold, pamtopnm -- command = $ocrad -- args = -s5 -i $input --} -+#scanset ocrad-decolorize-invert { -+# preprocessors = ppmtopgm, pamthreshold, pamtopnm -+# command = $ocrad -+# args = -s5 -i $input -+#} - - # Ocrad scanset with decolorization --scanset ocrad-decolorize { -- preprocessors = ppmtopgm, pamthreshold, pamtopnm -- command = $ocrad -- args = -s5 $input --} -+#scanset ocrad-decolorize { -+# preprocessors = ppmtopgm, pamthreshold, pamtopnm -+# command = $ocrad -+# args = -s5 $input -+#} - - # Standard Gocr Scanset - scanset gocr { diff --git a/mail-filter/spamassassin-fuzzyocr/files/enabletesseract.patch b/mail-filter/spamassassin-fuzzyocr/files/enabletesseract.patch deleted file mode 100644 index b95d0e7113d9..000000000000 --- a/mail-filter/spamassassin-fuzzyocr/files/enabletesseract.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- FuzzyOcr.scansets.orig 2006-12-26 23:45:35.000000000 +0100 -+++ FuzzyOcr.scansets 2006-12-27 00:09:48.000000000 +0100 -@@ -45,12 +45,12 @@ - } - - # An example Scanset how to use tesseract (disabled by default) --#scanset tesseract { --# preprocessors = maketiff --# command = $tesseract --# args = $input $output --# force_output_in = $output.txt --#} -+scanset tesseract { -+ preprocessors = maketiff -+ command = $tesseract -+ args = $input $output -+ force_output_in = $output.txt -+} - - # Another example, this basically does the same as the inverted Ocrad Scanset - # Only listed here to serve as example, ocrad-invert does this already diff --git a/mail-filter/spamassassin-fuzzyocr/files/fuzzyocr.logrotate b/mail-filter/spamassassin-fuzzyocr/files/fuzzyocr.logrotate deleted file mode 100644 index d0adea4b0043..000000000000 --- a/mail-filter/spamassassin-fuzzyocr/files/fuzzyocr.logrotate +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-fuzzyocr/files/fuzzyocr.logrotate,v 1.2 2007/04/23 19:37:50 swegener Exp $ - -/var/log/FuzzyOcr.log { - sharedscripts - missingok - postrotate - endscript -} diff --git a/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-fix_falsepositives.patch b/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-fix_falsepositives.patch deleted file mode 100644 index b79d38a4e399..000000000000 --- a/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-fix_falsepositives.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r FuzzyOcr-3.5.1-orig/FuzzyOcr.pm FuzzyOcr-3.5.1/FuzzyOcr.pm ---- FuzzyOcr-3.5.1-orig/FuzzyOcr.pm 2007-01-07 04:05:08.000000000 -0800 -+++ FuzzyOcr-3.5.1/FuzzyOcr.pm 2007-04-17 14:21:25.000000000 -0700 -@@ -146,7 +146,7 @@ - ){ - $fname = join('',@{$p->{'headers'}->{'content-id'}}); - $fname =~ s/[<>]//g; -- $fname =~ tr/\@\$\%\&/_/s; -+ $fname =~ tr/\@\$\%\&\./_/s; - } - - my $filename = $fname; $filename =~ tr{a-zA-Z0-9\-.}{_}cs; diff --git a/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-fix_tesseract.patch b/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-fix_tesseract.patch deleted file mode 100644 index 4d9543be99ef..000000000000 --- a/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-fix_tesseract.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- FuzzyOcr-3.5.1-orig/Preprocessor.pm.ORIG 2008-05-15 18:24:22.000000000 +0200 -+++ FuzzyOcr/Preprocessor.pm 2008-05-15 18:51:03.000000000 +0200 -@@ -15,6 +15,9 @@ sub run { - my $tmpdir = FuzzyOcr::Config::get_tmpdir(); - my $label = $self->{label}; - my $output = "$tmpdir/prep.$label.out"; -+ if ($label =~ /maketiff/) { -+ $output = "$tmpdir/prep.$label.tif"; -+ } - my $stderr = ">$tmpdir/prep.$label.err"; - - my $stdin = undef; ---- FuzzyOcr-3.5.1-orig/Scanset.pm.ORIG 2008-05-15 18:56:11.000000000 +0200 -+++ FuzzyOcr/Scanset.pm 2008-05-15 19:03:26.000000000 +0200 -@@ -63,7 +63,12 @@ sub run { - return ($retcode,@result); - } - # Input of next processor is output of last -- $input = "$tmpdir/prep.$plabel.out"; -+ # Output name of maketiff is special! -+ if ($plabel =~ /maketiff/) { -+ $input = "$tmpdir/prep.$plabel.tif"; -+ } else { -+ $input = "$tmpdir/prep.$plabel.out"; -+ } - } - } diff --git a/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-fix_tmpdir.patch b/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-fix_tmpdir.patch deleted file mode 100644 index 93896ef76c0e..000000000000 --- a/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-fix_tmpdir.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -ur FuzzyOcr.orig/Deanimate.pm FuzzyOcr/Deanimate.pm ---- FuzzyOcr.orig/Deanimate.pm Sun Jan 7 19:05:18 2007 -+++ FuzzyOcr/Deanimate.pm Thu Nov 15 13:19:00 2007 -@@ -8,13 +8,14 @@ - use FuzzyOcr::Config qw(get_config set_config get_tmpdir); - use FuzzyOcr::Misc qw(save_execute); - use FuzzyOcr::Logging qw(errorlog warnlog infolog); -+use File::Basename qw(dirname); - - # Provide functions to deanimate gifs - - sub deanimate { - my $conf = get_config(); -- my $imgdir = get_tmpdir(); - my $tfile = shift; -+ my $imgdir = dirname($tfile); - my $efile = $tfile . ".err"; - my $tfile2 = $tfile; - my $tfile3 = $tfile; -@@ -58,8 +59,8 @@ - - sub gif_info { - my $conf = get_config(); -- my $imgdir = get_tmpdir(); - my $giffile = $_[0]; -+ my $imgdir = dirname($giffile); - - my $fd = new IO::Handle; - -diff -ur FuzzyOcr.orig/Preprocessor.pm FuzzyOcr/Preprocessor.pm ---- FuzzyOcr.orig/Preprocessor.pm Sun Jan 7 19:05:18 2007 -+++ FuzzyOcr/Preprocessor.pm Thu Nov 15 12:31:05 2007 -@@ -1,5 +1,7 @@ - package FuzzyOcr::Preprocessor; - -+use File::Basename qw(dirname); -+ - sub new { - my ($class, $label, $command, $args) = @_; - -@@ -12,7 +14,7 @@ - - sub run { - my ($self, $input) = @_; -- my $tmpdir = FuzzyOcr::Config::get_tmpdir(); -+ my $tmpdir = dirname($input); - my $label = $self->{label}; - my $output = "$tmpdir/prep.$label.out"; - my $stderr = ">$tmpdir/prep.$label.err"; -diff -ur FuzzyOcr.orig/Scanset.pm FuzzyOcr/Scanset.pm ---- FuzzyOcr.orig/Scanset.pm Sun Jan 7 19:05:18 2007 -+++ FuzzyOcr/Scanset.pm Thu Nov 15 13:20:39 2007 -@@ -2,6 +2,7 @@ - - use lib qw(..); - use FuzzyOcr::Logging qw(errorlog); -+use File::Basename qw(dirname); - - sub new { - my ($class, $label, $preprocessors, $command, $args, $output_in) = @_; -@@ -19,7 +20,7 @@ - sub run { - my ($self, $input) = @_; - my $conf = FuzzyOcr::Config::get_config(); -- my $tmpdir = FuzzyOcr::Config::get_tmpdir(); -+ my $tmpdir = dirname($input); - my $label = $self->{label}; - my $output = "$tmpdir/scanset.$label.out"; - my $stderr = ">$tmpdir/scanset.$label.err"; diff --git a/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch b/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch deleted file mode 100644 index 08b70653ab1a..000000000000 --- a/mail-filter/spamassassin-fuzzyocr/files/spamassassin-fuzzyocr-3.6.0-untaint_ocr_helper.patch +++ /dev/null @@ -1,42 +0,0 @@ -Description: untaint config entries - Explicitly untainting the data from focr_bin_helper and focr_bin_<progname> - config entries to make sure Perl can execute the programs in taint mode. -Forwarded: Christian Holler <decoder@own-hero.net> -Author: Arjan Opmeer <arjan.opmeer@gmail.com> -Bug-Debian: http://bugs.debian.org/568560 -Bug-Debian: http://bugs.debian.org/568233 -Last-Update: 2010-05-18 - ---- a/FuzzyOcr/Config.pm -+++ b/FuzzyOcr/Config.pm -@@ -577,7 +577,7 @@ sub parse_config { - return 1; - } elsif ($opts->{key} eq 'focr_bin_helper') { - my @cmd; $conf = $opts->{conf}; -- my $val = $opts->{value}; $val =~ s/[\s]*//g; -+ my $val = Mail::SpamAssassin::Util::untaint_var($opts->{value}); $val =~ s/[\s]*//g; - debuglog("focr_bin_helper: '$val'"); - foreach my $bin (split(',',$val)) { - unless (grep {m/$bin/} @bin_utils) { -@@ -618,6 +618,7 @@ sub finish_parsing_end { - delete $conf->{$b}; - } - if (defined $conf->{$b}) { -+ $conf->{$b} = Mail::SpamAssassin::Util::untaint_var($conf->{$b}); - debuglog("Using $a => $conf->{$b}"); - } else { - foreach my $p (@paths) { -diff --git a/FuzzyOcr/Logging.pm b/FuzzyOcr/Logging.pm -index bed9ff5..ef02b32 100644 ---- a/FuzzyOcr/Logging.pm -+++ b/FuzzyOcr/Logging.pm -@@ -31,7 +31,8 @@ sub logfile { - my $time = strftime("%Y-%m-%d %H:%M:%S",localtime(time)); - $logtext =~ s/\n/\n /g; - -- unless ( open LOGFILE, ">>", $conf->{focr_logfile} ) { -+ my $fname = Mail::SpamAssassin::Util::untaint_file_path($conf->{focr_logfile}); -+ unless ( open LOGFILE, ">>", $fname ) { - warn "Can't open $conf->{focr_logfile} for writing, check permissions"; - return; - } diff --git a/mail-filter/spamassassin-fuzzyocr/metadata.xml b/mail-filter/spamassassin-fuzzyocr/metadata.xml deleted file mode 100644 index cdd0ae7cec0a..000000000000 --- a/mail-filter/spamassassin-fuzzyocr/metadata.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>perl</herd> - <maintainer> - <email>chutzpah@gentoo.org</email> - <name>Patrick McLean</name> - </maintainer> - <longdescription>This plugin checks for specific keywords in image/gif, - image/jpeg or image/png attachments, using gocr (an optical character - recognition program). - This plugin can be used to detect spam that puts all the real spam - content in an attached image. The mail itself only random text and - random html, without any URL's or identifiable information.</longdescription> -<use> - <flag name='amavis'>Enable support for - <pkg>mail-filter/amavisd-new</pkg></flag> - <flag name='gocr'>Enable support for the gocr OCR engine</flag> - <flag name='logrotate'>Install support files for - <pkg>app-admin/logrotate</pkg></flag> - <flag name='ocrad'>Enable support for the ocrad OCR engine</flag> - <flag name='tesseract'>Enable support for the tesseract OCR engine</flag> -</use> -</pkgmetadata> diff --git a/mail-filter/spamassassin-fuzzyocr/spamassassin-fuzzyocr-3.6.0-r2.ebuild b/mail-filter/spamassassin-fuzzyocr/spamassassin-fuzzyocr-3.6.0-r2.ebuild deleted file mode 100644 index e41706bc1c05..000000000000 --- a/mail-filter/spamassassin-fuzzyocr/spamassassin-fuzzyocr-3.6.0-r2.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-fuzzyocr/spamassassin-fuzzyocr-3.6.0-r2.ebuild,v 1.5 2014/11/09 22:20:01 dilfridge Exp $ - -EAPI=5 -inherit perl-module eutils user - -MY_P="${P#spamassassin-}" - -DESCRIPTION="SpamAssassin plugin for performing Optical Character Recognition (OCR) on attached images" -HOMEPAGE="http://fuzzyocr.own-hero.net/" -SRC_URI="http://users.own-hero.net/~decoder/fuzzyocr/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="dbm gocr ocrad tesseract mysql logrotate amavis" - -DEPEND="dev-lang/perl - dev-perl/Tie-Cache - >=mail-filter/spamassassin-3.2.0" - -RDEPEND="${DEPEND} - gocr? ( >=app-text/gocr-0.43 ) - ocrad? ( >=app-text/ocrad-0.14 ) - tesseract? ( app-text/tesseract ) - !gocr? ( !ocrad? ( !tesseract? ( >=app-text/ocrad-0.14 ) ) ) - mysql? ( dev-perl/DBD-mysql dev-perl/DBI ) - logrotate? ( app-admin/logrotate ) - dbm? ( virtual/perl-DB_File dev-perl/MLDBM-Sync virtual/perl-Storable ) - media-libs/netpbm[jpeg,png,tiff] - media-libs/giflib - dev-perl/String-Approx - virtual/perl-Time-HiRes - media-gfx/gifsicle" -# postgres? ( dev-perl/DBD-Pg ) - -S="${WORKDIR}/${MY_P/fuzzyocr/FuzzyOcr}" - -pkg_setup() { - if ! use gocr && ! use ocrad && ! use tesseract ; then - ewarn You did not specify an OCR engine. They can be - ewarn enabled/disabled via the USE flags: - ewarn gocr ocrad tesseract - ewarn Defaulting to ocrad - fi - - # create fuzzyocr group for logging and hashing - if use dbm || use logrotate ; then - use amavis || enewgroup fuzzyocr - fi -} - -src_prepare() { - # Bug #174993 - epatch "${FILESDIR}"/${P}-fix_falsepositives.patch - # Bug #273183 - epatch "${FILESDIR}"/${P}-fix_tmpdir.patch - # Bug #313633 - epatch "${FILESDIR}"/${P}-untaint_ocr_helper.patch - # Bug #330461 - epatch "${FILESDIR}"/${P}-fix_tesseract.patch - - # If no ocrad USE flag, remove it from Fuzzyocr.scansets / jni - use ocrad || epatch "${FILESDIR}"/disableocrad.patch - - # If tesseract USE flag is set, enable it in Fuzzyocr.scansets /jni - use tesseract && epatch "${FILESDIR}"/enabletesseract.patch - - # If gocr USE flag is unset, enable disable gocr in Fuzzyocr.scansets /jni - use gocr || epatch "${FILESDIR}"/disablegocr.patch - - # Apply PgSQL patchset if USE postgres /juan - #use postgres && epatch "${FILESDIR}"/postgresql.patch -} - -src_install() { - # called to get ${VENDOR_LIB} - perl_set_version - - local plugin_dir=${VENDOR_LIB}/Mail/SpamAssassin/Plugin - - insinto ${plugin_dir} - doins FuzzyOcr.pm - - # Replace location of .pm file in config - sed -ie "s:FuzzyOcr.pm:${plugin_dir}/FuzzyOcr.pm:" FuzzyOcr.cf - - # Enable logfile if logrotate - if use logrotate ; then - sed -ie "s:^#focr_verbose 3:focr_verbose 3:" FuzzyOcr.cf - sed -ie "s:^#focr_logfile /tmp/FuzzyOcr.log:focr_logfile /var/log/FuzzyOcr.log:" FuzzyOcr.cf - - # Create the logfile with correct permissions /jni - if [ ! -e /var/log/FuzzyOcr.log ]; then - insinto /var/log - newins /dev/null FuzzyOcr.log - if use amavis ; then - fperms 600 /var/log/FuzzyOcr.log - fowners amavis:amavis /var/log/FuzzyOcr.log - else - fperms 660 /var/log/FuzzyOcr.log - fowners root:fuzzyocr /var/log/FuzzyOcr.log - fi - fi - - diropts "" - dodir /etc/logrotate.d - insopts -m0644 - insinto /etc/logrotate.d - newins "${FILESDIR}"/fuzzyocr.logrotate FuzzyOcr - fi - - # Create needed dir for dbs and change FuzzyOcr.cf /jni - if use dbm ; then - dodir /var/lib/FuzzyOcr - keepdir /var/lib/FuzzyOcr - if use amavis ; then - fowners amavis:amavis /var/lib/FuzzyOcr - fperms 700 /var/lib/FuzzyOcr - else - fowners root:fuzzyocr /var/lib/FuzzyOcr - fperms 770 /var/lib/FuzzyOcr - fi - - sed -ie "s:^#focr_digest_db /etc/mail/spamassassin/FuzzyOcr.hashdb:#focr_digest_db /var/lib/FuzzyOcr/FuzzyOcr.hashdb:" FuzzyOcr.cf - sed -ie "s:^#focr_db_hash /etc/mail/spamassassin/FuzzyOcr.db:#focr_db_hash /var/lib/FuzzyOcr/FuzzyOcr.db:" FuzzyOcr.cf - sed -ie "s:^#focr_db_safe /etc/mail/spamassassin/FuzzyOcr.safe.db:#focr_db_safe /var/lib/FuzzyOcr/FuzzyOcr.safe.db:" FuzzyOcr.cf - - if ! use amavis ; then - insinto /var/lib/FuzzyOcr/ - - local hash_files="FuzzyOcr.hashdb FuzzyOcr.db FuzzyOcr.safe.db" - - for file in ${hash_files}; do - if [ ! -e /var/lib/FuzzyOcr/${file} ]; then - newins /dev/null ${file} - fperms 660 /var/lib/FuzzyOcr/${file} - fowners root:fuzzyocr /var/lib/FuzzyOcr/${file} - fi - done - fi - fi - - insinto /etc/mail/spamassassin/ - - doins FuzzyOcr.cf - doins FuzzyOcr.words - doins FuzzyOcr.scansets - doins FuzzyOcr.preps - insinto ${VENDOR_LIB}/FuzzyOcr - doins FuzzyOcr/* - - docinto samples - dodoc samples/* -} - -pkg_postinst() { - elog "You need to restart spamassassin (as root) before this plugin will work:" - elog "/etc/init.d/spamd restart" - echo - if use dbm || use logrotate ; then - local files="" - - if use dbm ; then - files="/var/lib/FuzzyOcr" - fi - - if use logrotate ; then - if [ -z ${files} ] ; then - files="/var/log/FuzzyOcr.log" - else - files="${files} /var/log/FuzzyOcr.log" - fi - fi - - if use amavis ; then - elog "All permissions are set for the user amavis!" - else - elog "Permissions have been set for the fuzzyocr group, to enable" - elog "logging or hashing add any required users to this group" - fi - - echo - ewarn "If you run spamassassin as another user, please make sure to" - ewarn "change permissions on" ${files/ / and } - echo - fi -} |