added fixes for bugs #138393, #179428, and #187118

(Portage version: 2.1.3)

6 files changed, 50 insertions, 8 deletions

diff --git a/net-misc/hylafax/ChangeLog b/net-misc/hylafax/ChangeLog
index 346c208b63e0..218b6c13205d 100644
--- a/net-misc/hylafax/ChangeLog
+++ b/net-misc/hylafax/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/hylafax
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.76 2007/04/28 16:55:05 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.77 2007/08/24 03:42:26 nerdboy Exp $
+
+  24 Aug 2007; Steve Arnold <nerdboy@gentoo.org>
+  +files/gentoo-gcc-version.patch, +files/hylafax.cron,
+  +files/hylafax.modules, hylafax-4.3.0.ebuild, hylafax-4.3.1.ebuild:
+  Added fixes for bugs #138393, #179428, and #187118 - a patch (fixed
+  upstream in trunk) and some ebuild updates, along with a couple of
+  example files for the faxqclean cron job and iptables (left as an
+  install exercise for the user).  Thanks to several people for the
+  patch and other files (see the relevant bugs).
 
   28 Apr 2007; Sven Wegener <swegener@gentoo.org> hylafax-4.2.5.ebuild,
   hylafax-4.3.0.ebuild, hylafax-4.3.1.ebuild:
diff --git a/net-misc/hylafax/files/gentoo-gcc-version.patch b/net-misc/hylafax/files/gentoo-gcc-version.patch
new file mode 100644
index 000000000000..ea1d23013cba
--- /dev/null
+++ b/net-misc/hylafax/files/gentoo-gcc-version.patch
@@ -0,0 +1,11 @@
+--- configure.orig	2007-08-20 09:45:12.000000000 +0930
++++ configure	2007-08-20 10:01:59.000000000 +0930
+@@ -802,7 +802,7 @@
+ {
+     app=$1; shift
+     eval `$app -v 2>&1 | \
+-	sed -n -e '/[Vv]ersion/s/.* [a-z\-]*\([0-9]*\)\.\([0-9]*\).\([0-9]*\).*/GCCdist=\1;GCCmajor=\2;GCCminor=\3/p'`
++	sed -n -e '/[Vv]ersion/s/[^(]* [a-z\-]*\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/GCCdist=\1;GCCmajor=\2;GCCminor=\3/p'`
+     GCCversion="${GCCdist}.${GCCmajor}.${GCCminor}"; export GCCversion
+     if [ ${GCCdist} -gt $1 ]; then
+         return 0
diff --git a/net-misc/hylafax/files/hylafax.cron b/net-misc/hylafax/files/hylafax.cron
new file mode 100644
index 000000000000..094ce81a8e0c
--- /dev/null
+++ b/net-misc/hylafax/files/hylafax.cron
@@ -0,0 +1,2 @@
+0 * * * *	root	/usr/sbin/faxqclean
+25 23 * * *	root	sh /usr/sbin/faxcron | mail FaxMaster
diff --git a/net-misc/hylafax/files/hylafax.modules b/net-misc/hylafax/files/hylafax.modules
new file mode 100644
index 000000000000..ebcf48a63275
--- /dev/null
+++ b/net-misc/hylafax/files/hylafax.modules
@@ -0,0 +1 @@
+options ip_conntrack_ftp ports=21,4559
diff --git a/net-misc/hylafax/hylafax-4.3.0.ebuild b/net-misc/hylafax/hylafax-4.3.0.ebuild
index af65bd4fb5b3..39c02e7091d7 100644
--- a/net-misc/hylafax/hylafax-4.3.0.ebuild
+++ b/net-misc/hylafax/hylafax-4.3.0.ebuild
@@ -1,6 +1,6 @@
 # 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.3.0.ebuild,v 1.9 2007/04/28 22:30:06 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.3.0.ebuild,v 1.10 2007/08/24 03:42:26 nerdboy Exp $
 
 inherit eutils multilib pam flag-o-matic toolchain-funcs
 
@@ -51,6 +51,8 @@ src_compile() {
 	[ $(gcc-major-version) -eq 3 ] && [ $(gcc-minor-version) -ge 4 ] \
 		&& filter-flags -fstack-protector -fstack-protector-all
 
+	epatch ${FILESDIR}/gentoo-gcc-version.patch || die "epatch failed"
+
 	local my_conf="
 		--with-DIR_BIN=/usr/bin
 		--with-DIR_SBIN=/usr/sbin
diff --git a/net-misc/hylafax/hylafax-4.3.1.ebuild b/net-misc/hylafax/hylafax-4.3.1.ebuild
index 3bd97303a15b..fae965976964 100644
--- a/net-misc/hylafax/hylafax-4.3.1.ebuild
+++ b/net-misc/hylafax/hylafax-4.3.1.ebuild
@@ -1,6 +1,6 @@
 # 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.3.1.ebuild,v 1.5 2007/04/28 22:30:06 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.3.1.ebuild,v 1.6 2007/08/24 03:42:26 nerdboy Exp $
 
 inherit eutils multilib pam flag-o-matic toolchain-funcs
 
@@ -51,6 +51,8 @@ src_compile() {
 	[ $(gcc-major-version) -eq 3 ] && [ $(gcc-minor-version) -ge 4 ] \
 		&& filter-flags -fstack-protector -fstack-protector-all
 
+	epatch ${FILESDIR}/gentoo-gcc-version.patch || die "epatch failed"
+
 	local my_conf="
 		--with-DIR_BIN=/usr/bin
 		--with-DIR_SBIN=/usr/sbin
@@ -98,6 +100,8 @@ src_compile() {
 	#--enable-pam isn't valid
 	use pam || my_conf="${my_conf} $(use_enable pam)"
 
+	myconf="CC=$(tc-getCC) CXX=$(tc-getCXX) ${my_conf}"
+
 	# eval required for quoting in ${my_conf} to work properly, better way?
 	eval ./configure --nointeractive ${my_conf} || die "./configure failed"
 
@@ -126,6 +130,9 @@ src_install() {
 	keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp}
 	keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
 
+	dosed "s:hostname:hostname -f:g" \
+	    /var/spool/fax/bin/{faxrcvd,pollrcvd} || die "dosed failed"
+
 	einfo "Adding env.d entry for Hylafax"
 	newenvd ${FILESDIR}/99hylafax-4.2 99hylafax
 
@@ -138,9 +145,19 @@ src_install() {
 }
 
 pkg_postinst() {
-	echo
-	einfo "See the docs and man pages for detailed configuration info."
-	echo
-	einfo "Now run faxsetup and (if necessary) faxaddmodem."
-	echo
+	elog
+	elog "There are additional files included in the hylafax/files dir."
+	elog
+	elog "Note 1: hylafax.cron is provided for vixie-cron users and"
+	elog "should be placed in /etc/cron.d.  Use as-is or adapt it to"
+	elog "your system config."
+	elog
+	elog "Note 2: if you need to use hylafax with iptables, then you"
+	elog "need to specify the port and use ip_conntrack_ftp as shown"
+	elog "in the included example modules file."
+	elog
+	elog "See the docs and man pages for detailed configuration info."
+	elog
+	elog "Now run faxsetup and (if necessary) faxaddmodem."
+	elog
 }