updated to new version and patched previous version (bug #116389)

(Portage version: 2.1_pre3-r1)

9 files changed, 227 insertions, 8 deletions

diff --git a/net-misc/hylafax/ChangeLog b/net-misc/hylafax/ChangeLog
index cb3a25d7c22f..d8917ad46ab4 100644
--- a/net-misc/hylafax/ChangeLog
+++ b/net-misc/hylafax/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/hylafax
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.58 2005/12/24 16:05:07 killerfox Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.59 2006/01/05 07:51:49 nerdboy Exp $
+
+*hylafax-4.2.4 (05 Jan 2006)
+*hylafax-4.2.3-r1 (05 Jan 2006)
+
+  05 Jan 2006; Steve Arnold <nerdboy@gentoo.org>
+  +files/hylafax-4.2.3-faxrcvd-eval-vulnerability.patch,
+  +files/hylafax-4.2.3-notify-eval-vulnerability.patch,
+  -hylafax-4.2.3.ebuild, +hylafax-4.2.3-r1.ebuild, +hylafax-4.2.4.ebuild:
+  Updated to new version and patched previous version (bug #116389)
 
   24 Dec 2005; Rene Nussbaumer <killerfox@gentoo.org>
   hylafax-4.2.1-r2.ebuild:
diff --git a/net-misc/hylafax/Manifest b/net-misc/hylafax/Manifest
index 291d97af940d..9015f0dbc47d 100644
--- a/net-misc/hylafax/Manifest
+++ b/net-misc/hylafax/Manifest
@@ -4,7 +4,8 @@ MD5 eab749cee07de1984c9756e6eb886df0 files/configure-gcc-3.4.patch 696
 MD5 61b6d16148a84723c2996b519a57d498 files/digest-hylafax-4.2.0-r3 66
 MD5 e1c4b78af20d5e332db1aef29080caf7 files/digest-hylafax-4.2.1-r2 66
 MD5 393322f25c85e29fe90c0d2cbe503833 files/digest-hylafax-4.2.2 66
-MD5 f9beb4e52eb7048b39f745a7a72b892c files/digest-hylafax-4.2.3 66
+MD5 f9beb4e52eb7048b39f745a7a72b892c files/digest-hylafax-4.2.3-r1 66
+MD5 be02aba24a3d489a6ace152f25889e39 files/digest-hylafax-4.2.4 66
 MD5 491e78765b433d7c11146120cf7e40f8 files/hylafax-4.2 3759
 MD5 6c0efb14f66d112c7e11255ce1835079 files/hylafax-4.2-tmpdir.patch 3433
 MD5 c4edcc178e6eeca8ec4680be0790e6da files/hylafax-4.2.0-fPIC.patch 1627
@@ -12,9 +13,12 @@ MD5 cfcafeadd916b8a9103b9b9110887916 files/hylafax-4.2.0-faxcron_uid.patch 527
 MD5 9cf5cada0895231b3d403f8791431102 files/hylafax-4.2.0-faxmail-charset.patch 473
 MD5 6fd09a3cd0a1657591fc6c5c076cd462 files/hylafax-4.2.0-tiff_version.patch 1011
 MD5 0bf655709c9fc6c62ffc7d2a63340c90 files/hylafax-4.2.1-openpam.patch 1571
+MD5 b6a1547c8ea1f4cd6f2598838f74e95e files/hylafax-4.2.3-faxrcvd-eval-vulnerability.patch 831
+MD5 f5ab440f7054627896009d94f5a5b735 files/hylafax-4.2.3-notify-eval-vulnerability.patch 2037
 MD5 363ea0f56887928eb876bbe25223de85 files/hylafax-hostvuln.patch 2098
 MD5 f1d61ffa610e7e848b5e0341aeafe491 hylafax-4.2.0-r3.ebuild 3557
 MD5 d1cf6c4df27248da7e9d601bff6e6dba hylafax-4.2.1-r2.ebuild 3884
 MD5 277e28932397e218eaa1ed7962d87fe2 hylafax-4.2.2.ebuild 3844
-MD5 bad7b95bee6a7cf089e709d0e17ac81f hylafax-4.2.3.ebuild 3759
+MD5 6e1da808e3c50941c08ee849beeeeb88 hylafax-4.2.3-r1.ebuild 3918
+MD5 d65b7095758a057626dbf3f4bace21dc hylafax-4.2.4.ebuild 3762
 MD5 d82acf1bcf0f7f9e181d6a2821292f2e metadata.xml 435
diff --git a/net-misc/hylafax/files/digest-hylafax-4.2.3 b/net-misc/hylafax/files/digest-hylafax-4.2.3-r1
index a65f4a513eac..a65f4a513eac 100644
--- a/net-misc/hylafax/files/digest-hylafax-4.2.3
+++ b/net-misc/hylafax/files/digest-hylafax-4.2.3-r1
diff --git a/net-misc/hylafax/files/digest-hylafax-4.2.4 b/net-misc/hylafax/files/digest-hylafax-4.2.4
new file mode 100644
index 000000000000..f0d1c1a3dcb1
--- /dev/null
+++ b/net-misc/hylafax/files/digest-hylafax-4.2.4
@@ -0,0 +1 @@
+MD5 1cda04f9faf643095b918956bacf1cf2 hylafax-4.2.4.tar.gz 1450465
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
new file mode 100644
index 000000000000..2f9642d2ba4e
--- /dev/null
+++ b/net-misc/hylafax/files/hylafax-4.2.3-faxrcvd-eval-vulnerability.patch
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 000000000000..ce6ef33e9ee1
--- /dev/null
+++ b/net-misc/hylafax/files/hylafax-4.2.3-notify-eval-vulnerability.patch
@@ -0,0 +1,46 @@
+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/hylafax-4.2.1-r2.ebuild b/net-misc/hylafax/hylafax-4.2.1-r2.ebuild
index a802b09564fd..57b8b63d2435 100644
--- a/net-misc/hylafax/hylafax-4.2.1-r2.ebuild
+++ b/net-misc/hylafax/hylafax-4.2.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.2.1-r2.ebuild,v 1.5 2005/12/24 16:05:07 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.2.1-r2.ebuild,v 1.6 2006/01/05 07:51:49 nerdboy Exp $
 
 inherit eutils multilib pam
 
diff --git a/net-misc/hylafax/hylafax-4.2.3-r1.ebuild b/net-misc/hylafax/hylafax-4.2.3-r1.ebuild
new file mode 100644
index 000000000000..5be6f199a105
--- /dev/null
+++ b/net-misc/hylafax/hylafax-4.2.3-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2006 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.1 2006/01/05 07:51:49 nerdboy Exp $
+
+inherit eutils multilib pam
+
+IUSE="faxonly jpeg pam mgetty"
+
+DESCRIPTION="Client-server fax package for class 1 and 2 fax modems."
+HOMEPAGE="http://www.hylafax.org"
+SRC_URI="ftp://ftp.hylafax.org/source/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="hylafax"
+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 )
+	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
+}
+
+src_compile() {
+	if use faxonly; then
+		if use mgetty; then
+			eerror "You cannot set both faxonly and mgetty, please remove one." && die "invalid use flags"
+		fi
+	fi
+	local my_conf="
+		--with-DIR_BIN=/usr/bin
+		--with-DIR_SBIN=/usr/sbin
+		--with-DIR_LIB=/usr/$(get_libdir)
+		--with-DIR_LIBEXEC=/usr/sbin
+		--with-DIR_LIBDATA=/usr/$(get_libdir)/fax
+		--with-DIR_LOCKS=/var/lock
+		--with-DIR_MAN=/usr/share/man
+		--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-LIBTIFF=\"-ltiff -ljpeg -lz\"
+		--with-OPTIMIZER=\"${CFLAGS}\"
+		--with-DSO=auto"
+
+	if use mgetty; then
+		my_conf="${my_conf} \
+			--with-PATH_EGETTY=/usr/sbin/mgetty \
+			--with-PATH_VGETTY=/usr/sbin/vgetty"
+	else
+		my_conf="${my_conf} \
+			--with-PATH_EGETTY=/bin/false \
+			--with-PATH_VGETTY=/bin/false"
+	fi
+
+	if [ -h /etc/localtime ]; then
+		local continent=$(readlink /etc/localtime | cut -d / -f 5)
+		if [ "${continent}" == "Europe" ]; then
+			my_conf="${my_conf} --with-PAGESIZE=A4"
+		fi
+	fi
+
+	use faxonly && my_conf="${my_conf} --with-PATH_GETTY=/bin/false
+	                                  --with-PATH_VGETTY=/bin/false"
+	#--enable-pam isn't valid
+	use pam || my_conf="${my_conf} $(use_enable pam)"
+
+	# eval required for quoting in ${my_conf} to work properly, better way?
+	eval ./configure --nointeractive ${my_conf} || die "./configure failed"
+
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man /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)
+
+	make \
+		BIN=${D}/usr/bin \
+		SBIN=${D}/usr/sbin \
+		LIBDIR=${D}/usr/$(get_libdir) \
+		LIB=${D}/usr/$(get_libdir) \
+		LIBEXEC=${D}/usr/sbin \
+		LIBDATA=${D}/usr/$(get_libdir)/fax \
+		MAN=${D}/usr/share/man \
+		SPOOL=${D}/var/spool/fax \
+		HTMLDIR=${D}/usr/share/doc/${P}/html \
+		install || die "make install failed"
+
+	keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp}
+	keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
+
+	einfo "Adding env.d entry for Hylafax"
+	insinto /etc/env.d
+	newins ${FILESDIR}/99hylafax-4.2 99hylafax
+
+	einfo "Adding init.d entry for Hylafax"
+	insinto /etc/init.d
+	insopts -m 755
+	newins ${FILESDIR}/hylafax-4.2 hylafax
+
+	pamd_mimic_system hylafax auth account session
+
+	dodoc COPYRIGHT README TODO VERSION
+}
+
+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."
+	echo
+	einfo "Now run faxsetup and (if necessary) faxaddmodem."
+	echo
+}
diff --git a/net-misc/hylafax/hylafax-4.2.3.ebuild b/net-misc/hylafax/hylafax-4.2.4.ebuild
index 3ec09cf73ae8..6ef6b3d4c699 100644
--- a/net-misc/hylafax/hylafax-4.2.3.ebuild
+++ b/net-misc/hylafax/hylafax-4.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.ebuild,v 1.1 2005/12/19 01:39:23 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.2.4.ebuild,v 1.1 2006/01/05 07:51:49 nerdboy Exp $
 
 inherit eutils multilib pam