From ddeb210967466a2487f7687a44f2403caf2e2b1a Mon Sep 17 00:00:00 2001 From: Steve Arnold Date: Sun, 28 Jan 2007 23:59:35 +0000 Subject: [PATCH] added latest upstream version and removed oldest stale version Package-Manager: portage-2.1.2-r4 --- net-misc/hylafax/ChangeLog | 13 +++- net-misc/hylafax/Manifest | 36 ++++------- .../hylafax/files/digest-hylafax-4.2.3-r1 | 3 - net-misc/hylafax/files/digest-hylafax-4.3.1 | 3 + ...fax-4.2.3-faxrcvd-eval-vulnerability.patch | 21 ------- ...afax-4.2.3-notify-eval-vulnerability.patch | 46 --------------- .../files/hylafax-4.2.3-tiff_version.patch | 22 ------- ...x-4.2.3-r1.ebuild => hylafax-4.3.1.ebuild} | 59 ++++++++++--------- 8 files changed, 57 insertions(+), 146 deletions(-) delete mode 100644 net-misc/hylafax/files/digest-hylafax-4.2.3-r1 create mode 100644 net-misc/hylafax/files/digest-hylafax-4.3.1 delete mode 100644 net-misc/hylafax/files/hylafax-4.2.3-faxrcvd-eval-vulnerability.patch delete mode 100644 net-misc/hylafax/files/hylafax-4.2.3-notify-eval-vulnerability.patch delete mode 100644 net-misc/hylafax/files/hylafax-4.2.3-tiff_version.patch rename net-misc/hylafax/{hylafax-4.2.3-r1.ebuild => hylafax-4.3.1.ebuild} (72%) diff --git a/net-misc/hylafax/ChangeLog b/net-misc/hylafax/ChangeLog index 892d9f90b2d5..ebdcb0115367 100644 --- a/net-misc/hylafax/ChangeLog +++ b/net-misc/hylafax/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-misc/hylafax -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.72 2006/10/01 17:54:59 dertobi123 Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.73 2007/01/28 23:59:35 nerdboy Exp $ + +*hylafax-4.3.1 (28 Jan 2007) + + 28 Jan 2007; Steve Arnold + -files/hylafax-4.2.3-faxrcvd-eval-vulnerability.patch, + -files/hylafax-4.2.3-notify-eval-vulnerability.patch, + -files/hylafax-4.2.3-tiff_version.patch, -hylafax-4.2.3-r1.ebuild, + +hylafax-4.3.1.ebuild: + Added latest upstream version and removed oldest stale version. 01 Oct 2006; Tobias Scherbaum hylafax-4.3.0.ebuild: diff --git a/net-misc/hylafax/Manifest b/net-misc/hylafax/Manifest index 36b0d0774ce0..4cf3ae5da25d 100644 --- a/net-misc/hylafax/Manifest +++ b/net-misc/hylafax/Manifest @@ -6,18 +6,6 @@ AUX hylafax-4.2 3759 RMD160 d8a10429e912eaace4af98ee306c14b3f59ca7b4 SHA1 b41d46 MD5 491e78765b433d7c11146120cf7e40f8 files/hylafax-4.2 3759 RMD160 d8a10429e912eaace4af98ee306c14b3f59ca7b4 files/hylafax-4.2 3759 SHA256 83f1ba9a169f24721a4115dda3f3924c14804a09be2ff284fa52caeee455d166 files/hylafax-4.2 3759 -AUX hylafax-4.2.3-faxrcvd-eval-vulnerability.patch 831 RMD160 f02665ac65e9655542d97ed581894e827d7bdcfd SHA1 795496bfcf926ce6f75844c368d56fde2ae4f300 SHA256 265fdd927f6bcc8df5d85642a9d0049bba679c1617362c78ceae5e31aec613fe -MD5 b6a1547c8ea1f4cd6f2598838f74e95e files/hylafax-4.2.3-faxrcvd-eval-vulnerability.patch 831 -RMD160 f02665ac65e9655542d97ed581894e827d7bdcfd files/hylafax-4.2.3-faxrcvd-eval-vulnerability.patch 831 -SHA256 265fdd927f6bcc8df5d85642a9d0049bba679c1617362c78ceae5e31aec613fe files/hylafax-4.2.3-faxrcvd-eval-vulnerability.patch 831 -AUX hylafax-4.2.3-notify-eval-vulnerability.patch 2037 RMD160 baa0b0ffe85d8f37c41075d0dd098ffab0699521 SHA1 543d4e1b31df6bf79b8c51267903027eebbdca2b SHA256 027084bed6aa323dcfe3b0c7cbafc8eb02bb4324bd09c7a42b7aaa51cfcbda80 -MD5 f5ab440f7054627896009d94f5a5b735 files/hylafax-4.2.3-notify-eval-vulnerability.patch 2037 -RMD160 baa0b0ffe85d8f37c41075d0dd098ffab0699521 files/hylafax-4.2.3-notify-eval-vulnerability.patch 2037 -SHA256 027084bed6aa323dcfe3b0c7cbafc8eb02bb4324bd09c7a42b7aaa51cfcbda80 files/hylafax-4.2.3-notify-eval-vulnerability.patch 2037 -AUX hylafax-4.2.3-tiff_version.patch 949 RMD160 1bfd3d760def0f522724532ec3b2e8115562ca74 SHA1 e87083eca97a51b02a60e7267e5ea17ae88762b2 SHA256 d267bd842147e4458d91299671755acc3f85b30abbf4d9b323a9bed89ef3478d -MD5 c852f81b68b836699d3731be8a15ec5b files/hylafax-4.2.3-tiff_version.patch 949 -RMD160 1bfd3d760def0f522724532ec3b2e8115562ca74 files/hylafax-4.2.3-tiff_version.patch 949 -SHA256 d267bd842147e4458d91299671755acc3f85b30abbf4d9b323a9bed89ef3478d files/hylafax-4.2.3-tiff_version.patch 949 AUX hylafax-4.2.5-tiff_version.patch 906 RMD160 08eec1d890c3aaeffbfa7d211481538fb1f2350b SHA1 b2bb8e52f70d4d465a0b8f79a79fd16b5c190574 SHA256 6c195c06664fae498185a9cb420fe76f8b479b6f09da92422a8559202e03fb38 MD5 6fd84d9a809dfbfba4865b0579e9f936 files/hylafax-4.2.5-tiff_version.patch 906 RMD160 08eec1d890c3aaeffbfa7d211481538fb1f2350b files/hylafax-4.2.5-tiff_version.patch 906 @@ -26,13 +14,9 @@ AUX hylafax-fix-configure-gcc-3-4.patch 290 RMD160 7a6e436be11bca58cc49d03e8ab18 MD5 a4f4f78a3c373fd667bc538f46d5fc7a files/hylafax-fix-configure-gcc-3-4.patch 290 RMD160 7a6e436be11bca58cc49d03e8ab18746b48ac4d1 files/hylafax-fix-configure-gcc-3-4.patch 290 SHA256 48f6ba6fdfa9cef81f765c5a11e87fdbeaf158ad26c48fb228c612a2c7578715 files/hylafax-fix-configure-gcc-3-4.patch 290 -DIST hylafax-4.2.3.tar.gz 1449095 RMD160 f06d3e1c72c0ba5a082fee4a74830cf72b73d7dd SHA1 ebb339e01292593437887a82bad6a7d5c4d36f47 SHA256 47e6643b93353eb42b605ff745fd7e0f97c2834e601e2612566f1f66eaa6d04f DIST hylafax-4.2.5.tar.gz 1450958 RMD160 aef5e7a8ff32bafa43b5efc431b9fd8c334ddb3a SHA1 b3bfd492dcb85e8aa1ddff9e6dcec3c31e00fccc SHA256 0a5f7c52ee377fed60281d97681f50ae23062348e139f7fcc215957df9e69eb7 DIST hylafax-4.3.0.tar.gz 1468136 RMD160 29c62721e4895848b325f4f3a7b7e7782e275aa8 SHA1 cf0634c410996be1bf2fd34d83ad2dba45d69138 SHA256 a50512bfe6ae60573084dadfb5a629de78db30d19ac59ad6750bd621e138817c -EBUILD hylafax-4.2.3-r1.ebuild 4253 RMD160 e95455512ec38801df9b7411f2aa315aaf67bbb0 SHA1 8d04b63b74906f882a76ca1dcdf7cd45e3bf0225 SHA256 aea9535f93291e0bb044d5d04dd3d42cc0a65c28743abff7aef2bc66ffa36dab -MD5 a888d4a795d9ba164327e782440d3483 hylafax-4.2.3-r1.ebuild 4253 -RMD160 e95455512ec38801df9b7411f2aa315aaf67bbb0 hylafax-4.2.3-r1.ebuild 4253 -SHA256 aea9535f93291e0bb044d5d04dd3d42cc0a65c28743abff7aef2bc66ffa36dab hylafax-4.2.3-r1.ebuild 4253 +DIST hylafax-4.3.1.tar.gz 1498444 RMD160 1a29d43a05793ec4185c96ca16698268ae3f7c9b SHA1 9b42872912f2b75949423b76ab5f1b5e2caef869 SHA256 b777c0d8f1f858f3c86f91f9ae4fde9246646ac9e753154b969cb7c3a49947ab EBUILD hylafax-4.2.5.ebuild 4135 RMD160 e92214d5bc99ce0dec97404260bf01904dd3563d SHA1 9ae1e3e726a021d1da9e25ce630183443f66b1e0 SHA256 a4a7c8d0e35d16e60ceb838b883eacf9e9778bb329987e73ab1864473e9c82c9 MD5 87676128f6f1e8fe2fb36f5baf26c68d hylafax-4.2.5.ebuild 4135 RMD160 e92214d5bc99ce0dec97404260bf01904dd3563d hylafax-4.2.5.ebuild 4135 @@ -41,20 +25,24 @@ EBUILD hylafax-4.3.0.ebuild 4505 RMD160 2fc1616f546a8395cf699613c2ba4ec24d4fc423 MD5 bf5f60041e8638a513832c52467dba17 hylafax-4.3.0.ebuild 4505 RMD160 2fc1616f546a8395cf699613c2ba4ec24d4fc423 hylafax-4.3.0.ebuild 4505 SHA256 8ffb8049c31c544fe95e761c64f7e42b4d35ba255e33671dd3a03b408ffb4e58 hylafax-4.3.0.ebuild 4505 -MISC ChangeLog 14953 RMD160 eb40921601b388b3c175cae60abcaaf4afbcd627 SHA1 c9cb145831a70792002e068eef8474bd23fdeb1c SHA256 e2a5cb061893f8d6142f2e57b4bab5e74b607f13549fc64ff7647f1e4571266d -MD5 a6a08b7ea07b44875bbcb295a28c3a4f ChangeLog 14953 -RMD160 eb40921601b388b3c175cae60abcaaf4afbcd627 ChangeLog 14953 -SHA256 e2a5cb061893f8d6142f2e57b4bab5e74b607f13549fc64ff7647f1e4571266d ChangeLog 14953 +EBUILD hylafax-4.3.1.ebuild 4303 RMD160 091337ba71f64a678ed51f97c9df8a20a7a93f04 SHA1 8b8a9160cfa228c100f50b8c32fe5391d704b1a1 SHA256 8823179c3bd10dfcba893978a44903c8c1910b78bd04af255908ef4fcba1717b +MD5 35ec37d5c69c4a8f7ed47c2bf0e47e7e hylafax-4.3.1.ebuild 4303 +RMD160 091337ba71f64a678ed51f97c9df8a20a7a93f04 hylafax-4.3.1.ebuild 4303 +SHA256 8823179c3bd10dfcba893978a44903c8c1910b78bd04af255908ef4fcba1717b hylafax-4.3.1.ebuild 4303 +MISC ChangeLog 15303 RMD160 b937897f7ae28b98f71f3a11bb0a01eba62a1bd7 SHA1 66d04e81a4ffedb580c85a90e1190039355849c0 SHA256 2387e703f03841ff0d1ef7705f9f6efd8d85753afc10973041897e16553d3462 +MD5 c516106fa8cc7ee6a56bb6d5f739f979 ChangeLog 15303 +RMD160 b937897f7ae28b98f71f3a11bb0a01eba62a1bd7 ChangeLog 15303 +SHA256 2387e703f03841ff0d1ef7705f9f6efd8d85753afc10973041897e16553d3462 ChangeLog 15303 MISC metadata.xml 680 RMD160 f534f59f38ba9db8b9ec24d72164ef99e90d0e55 SHA1 927f92ce08fdd3c4018e0d231afa81265c4d2525 SHA256 2b5b94cc0d6e9c9cfcc5b8908abb649de267dbc9f4fc2e949a246f79745cf5fd MD5 4cb9907739cd9b93d9563d64b0919ee1 metadata.xml 680 RMD160 f534f59f38ba9db8b9ec24d72164ef99e90d0e55 metadata.xml 680 SHA256 2b5b94cc0d6e9c9cfcc5b8908abb649de267dbc9f4fc2e949a246f79745cf5fd metadata.xml 680 -MD5 bf61a6cec9cc30597effde5845970d73 files/digest-hylafax-4.2.3-r1 244 -RMD160 1dbd042687a1338eb0cbdcc66845b12ecf44a1ee files/digest-hylafax-4.2.3-r1 244 -SHA256 94b8b3ae26b156f5fa46cf127c44dba86819ca3d19ec4cb7b05843b4c9369973 files/digest-hylafax-4.2.3-r1 244 MD5 6b71597e15fe680589b48a0720105593 files/digest-hylafax-4.2.5 244 RMD160 995dd08a883913eccadd8d01e058347abd223d48 files/digest-hylafax-4.2.5 244 SHA256 470d3ce4479ec99b45896f0c74155d6dd1ef59cecc9f278fee4d07bad5db5a9d files/digest-hylafax-4.2.5 244 MD5 98482ca7ac93a91c47590c68a32097e8 files/digest-hylafax-4.3.0 244 RMD160 6823ad7b1e2586b66bfe640b32a8412166edd091 files/digest-hylafax-4.3.0 244 SHA256 046b78215a05bab017ee4aae5643452c2173a969bdf51faacf1b07c9bc60ce5a files/digest-hylafax-4.3.0 244 +MD5 e3245a69b6b41b579b0e055f6fc23c02 files/digest-hylafax-4.3.1 244 +RMD160 571774d6d6bcb318d5dacb0b27ee7000bb983098 files/digest-hylafax-4.3.1 244 +SHA256 e2a6cfa8add2f482b7ad722b47ea4134c8ac55070d2fbe5d4149dbc4f0e7d5dc files/digest-hylafax-4.3.1 244 diff --git a/net-misc/hylafax/files/digest-hylafax-4.2.3-r1 b/net-misc/hylafax/files/digest-hylafax-4.2.3-r1 deleted file mode 100644 index 4bc93d4b1ed6..000000000000 --- a/net-misc/hylafax/files/digest-hylafax-4.2.3-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 e72f381a766c58c692afdf42326dc4e6 hylafax-4.2.3.tar.gz 1449095 -RMD160 f06d3e1c72c0ba5a082fee4a74830cf72b73d7dd hylafax-4.2.3.tar.gz 1449095 -SHA256 47e6643b93353eb42b605ff745fd7e0f97c2834e601e2612566f1f66eaa6d04f hylafax-4.2.3.tar.gz 1449095 diff --git a/net-misc/hylafax/files/digest-hylafax-4.3.1 b/net-misc/hylafax/files/digest-hylafax-4.3.1 new file mode 100644 index 000000000000..8ccfe404e76e --- /dev/null +++ b/net-misc/hylafax/files/digest-hylafax-4.3.1 @@ -0,0 +1,3 @@ +MD5 edd50d92a598be13a985b3b94d280022 hylafax-4.3.1.tar.gz 1498444 +RMD160 1a29d43a05793ec4185c96ca16698268ae3f7c9b hylafax-4.3.1.tar.gz 1498444 +SHA256 b777c0d8f1f858f3c86f91f9ae4fde9246646ac9e753154b969cb7c3a49947ab hylafax-4.3.1.tar.gz 1498444 diff --git a/net-misc/hylafax/files/hylafax-4.2.3-faxrcvd-eval-vulnerability.patch b/net-misc/hylafax/files/hylafax-4.2.3-faxrcvd-eval-vulnerability.patch deleted file mode 100644 index 2f9642d2ba4e..000000000000 --- a/net-misc/hylafax/files/hylafax-4.2.3-faxrcvd-eval-vulnerability.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: util/faxrcvd.sh.in -=================================================================== -RCS file: /cvsroot/hylafax/util/faxrcvd.sh.in,v -retrieving revision 1.25 -diff -u -r1.25 faxrcvd.sh.in ---- util/faxrcvd.sh.in 2005/07/18 19:02:49 1.25 -+++ util/faxrcvd.sh.in 2005/12/16 23:23:34 -@@ -103,7 +103,12 @@ - MSG="$1"; shift; - COUNT=1 - while [ $# -ge 1 ]; do -- eval "CALLID$COUNT=\"$1\"" -+ # In shell scripts, there are no special characters in hard-quoted -+ # strings (quoted with (')). Single-quotes can't even be escaped -+ # inside such strings and must be put outside of them. We thus replace -+ # (') with ('\'') which terminates the current string, adds a single -+ # quote and starts a new string. -+ eval "CALLID$COUNT='`echo $1 | $SED -e "s/'/'\\\\\''/g"`'" - shift - COUNT=`expr $COUNT + 1` - done diff --git a/net-misc/hylafax/files/hylafax-4.2.3-notify-eval-vulnerability.patch b/net-misc/hylafax/files/hylafax-4.2.3-notify-eval-vulnerability.patch deleted file mode 100644 index ce6ef33e9ee1..000000000000 --- a/net-misc/hylafax/files/hylafax-4.2.3-notify-eval-vulnerability.patch +++ /dev/null @@ -1,46 +0,0 @@ -Index: util/notify.sh.in -=================================================================== -RCS file: /cvsroot/hylafax/util/notify.sh.in,v -retrieving revision 1.17 -diff -u -r1.17 notify.sh.in ---- util/notify.sh.in 2005/09/05 23:26:03 1.17 -+++ util/notify.sh.in 2005/12/16 23:23:19 -@@ -171,8 +171,18 @@ - eval `($AWK -F: ' - function p(varname,val) - { -+ # In shell scripts, there are no special characters in hard-quoted -+ # strings (quoted with (')). Single-quotes can't even be escaped -+ # inside such strings and must be put outside of them. We thus replace -+ # (') with ('\'') which terminates the current string, adds a single -+ # quote and starts a new string. -+ gsub(/\\047/, "\047\\\\\047\047", val); -+ # New lines in eval could cause problems so we escape them. As with -+ # single quotes above, we must first close the current string, add -+ # the escaped new line (double quoted) and start a new string. -+ gsub(/\n/, "\047\042\\\\n\042\047", val); - # print out variable name and value so we can eval it in the shell -- printf "%s=\"%s\"\n",varname,val -+ printf "%s=\\047%s\\047\n",varname,val - } - BEGIN { - nfiles = 0; -@@ -206,16 +216,9 @@ - /^jobtype/ { p("jobtype", $2); } - # status needs to be used in the shell as faxstatus since status is reserved word - /^status/ { status = $0; sub("status:", "", status); -- if (status ~ /\\\\$/) { -- sub(/\\\\$/, "\\\\n", status); -- while (getline > 0) { -+ while ($0 ~ /\\\\$/ && getline > 0) { -+ sub(/\\\\$/, "\\n", status); - status = status $0; -- gsub(/\*/,"",status); -- sub(/\\\\$/, "\\\\n", status); -- if ($0 !~ /\\\\$/) -- break; -- } -- gsub(/\`/, "", status); - } p("faxstatus", status); - } - /^resolution/ { p("resolution", $2); } diff --git a/net-misc/hylafax/files/hylafax-4.2.3-tiff_version.patch b/net-misc/hylafax/files/hylafax-4.2.3-tiff_version.patch deleted file mode 100644 index 22314687b9ba..000000000000 --- a/net-misc/hylafax/files/hylafax-4.2.3-tiff_version.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- configure.orig 2006-05-03 23:16:26.000000000 -0700 -+++ configure 2006-05-03 23:18:09.000000000 -0700 -@@ -2418,7 +2418,7 @@ - if [ ${header_ver} -ge 19960307 ]; then - if [ "${lib_ver}" = "3.4" ]; then - tiff_runlen_t="uint16" -- elif [ "${lib_ver}" = "3.5" -o "${lib_ver}" = "3.6" -o "${lib_ver}" = "3.7" ]; then -+ elif [ "${lib_ver}" = "3.6" -o "${lib_ver}" = "3.7" -o "${lib_ver}" = "3.8" ]; then - tiff_runlen_t="uint32" - fi - fi -@@ -2455,8 +2455,8 @@ - - Incompatible TIFF Library. - --HylaFAX ${VERSION} requires TIFF software distribution ver 3.4, 3.5, --3.6, or 3.7. If you do not have up to date TIFF software on your system -+HylaFAX ${VERSION} requires TIFF software distribution ver 3.5, 3.6, -+3.7, or 3.8. If you do not have up to date TIFF software on your system - then you can retrieve it from the location where you obtained this software. - The Home Page for version 3.5 and later is http://www.libtiff.org - EOF diff --git a/net-misc/hylafax/hylafax-4.2.3-r1.ebuild b/net-misc/hylafax/hylafax-4.3.1.ebuild similarity index 72% rename from net-misc/hylafax/hylafax-4.2.3-r1.ebuild rename to net-misc/hylafax/hylafax-4.3.1.ebuild index a25f2422462c..30ad50da94ae 100644 --- a/net-misc/hylafax/hylafax-4.2.3-r1.ebuild +++ b/net-misc/hylafax/hylafax-4.3.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.2.3-r1.ebuild,v 1.5 2006/05/04 07:11:57 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.3.1.ebuild,v 1.1 2007/01/28 23:59:35 nerdboy Exp $ inherit eutils multilib pam flag-o-matic toolchain-funcs -IUSE="faxonly jpeg pam mgetty" +IUSE="faxonly jbig pam mgetty html" DESCRIPTION="Client-server fax package for class 1 and 2 fax modems." HOMEPAGE="http://www.hylafax.org" @@ -12,32 +12,22 @@ SRC_URI="ftp://ftp.hylafax.org/source/${P}.tar.gz" SLOT="0" LICENSE="hylafax" -KEYWORDS="x86 sparc hppa alpha amd64 ppc" +KEYWORDS="~x86 ~sparc ~hppa ~alpha ~amd64 ~ppc" DEPEND="!faxonly? ( net-dialup/mgetty ) >=sys-libs/zlib-1.1.4 virtual/ghostscript - >=media-libs/tiff-3.7.0 - jpeg? ( media-libs/jpeg ) - media-libs/jbigkit + >=media-libs/tiff-3.8.2 + media-libs/jpeg + jbig? ( media-libs/jbigkit ) sys-apps/gawk pam? ( virtual/pam ) mgetty? ( net-dialup/mgetty )" RDEPEND="${DEPEND} - media-libs/netpbm net-mail/metamail" -export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc" - -src_unpack() { - unpack ${A} - - cd ${S} - epatch ${FILESDIR}/${P}-faxrcvd-eval-vulnerability.patch - epatch ${FILESDIR}/${P}-notify-eval-vulnerability.patch - epatch ${FILESDIR}/${P}-tiff_version.patch -} +export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax" src_compile() { if use faxonly; then @@ -45,6 +35,16 @@ src_compile() { eerror "You cannot set both faxonly and mgetty, please remove one." && die "invalid use flags" fi fi + if use jbig; then + einfo "Checking for tiff compiled with jbig support..." + if built_with_use media-libs/tiff jbig; then + einfo "Found jbig support; continuing..." + else + ewarn "Tiff (media-libs/tiff) must be compiled with jbig support." + einfo "Please re-emerge tiff with the jbig USE flag or disable it." + die "Tiff not merged with jbig USE flag" + fi + fi # Hylafax doesn't play nice with gcc-3.4 and SSP (bug #74457) # so drop the flags until a better solution comes along @@ -62,14 +62,20 @@ src_compile() { --with-DIR_SPOOL=/var/spool/fax --with-DIR_HTML=/usr/share/doc/${P}/html --with-DIR_CGI=${WORKDIR} - --with-HTML=yes --with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax --with-PATH_IMPRIP=\"\" --with-SYSVINIT=no + --with-REGEX=yes --with-LIBTIFF=\"-ltiff -ljpeg -lz\" --with-OPTIMIZER=\"${CFLAGS}\" --with-DSO=auto" + if use html; then + my_conf="${my_conf} --with-HTML=yes" + else + my_conf="${my_conf} --with-HTML=no" + fi + if use mgetty; then my_conf="${my_conf} \ --with-PATH_EGETTY=/usr/sbin/mgetty \ @@ -99,10 +105,11 @@ src_compile() { } src_install() { - dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man /var/spool /var/spool/recvq + dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man + dodir /var/spool /var/spool/recvq fowners uucp:uucp /var/spool/fax fperms 0600 /var/spool/fax - dodir /usr/share/doc/${P}/html /usr/$(get_libdir) + dodir /usr/share/doc/${P}/html make \ BIN=${D}/usr/bin \ @@ -128,18 +135,14 @@ src_install() { insopts -m 755 newins ${FILESDIR}/hylafax-4.2 hylafax - pamd_mimic_system hylafax auth account session + use pam && pamd_mimic_system hylafax auth account session - dodoc COPYRIGHT README TODO VERSION + dodoc CHANGES CONTRIBUTORS COPYRIGHT README TODO } pkg_postinst() { - ewarn "New Hylafax tiff support requires at least tiff-3.7.0 now," - ewarn "but hopefully this libtiff silliness is now fixed." - ewarn "If you have trouble building this brittle C++ code," - ewarn "try disabling distcc and setting MAKEOPTS to -j1." echo - einfo "Hylafax is back to depending on metamail for mime handling." + einfo "See the docs and man pages for detailed configuration info." echo einfo "Now run faxsetup and (if necessary) faxaddmodem." echo -- 2.26.2