added latest upstream version and removed oldest stale version

(Portage version: 2.1.2-r4)

7 files changed, 45 insertions, 122 deletions

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 <nerdboy@gentoo.org>
+  -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 <dertobi123@gentoo.org>
   hylafax-4.3.0.ebuild:
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
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