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

Package-Manager: portage-2.1.3

7 files changed, 74 insertions, 30 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/Manifest b/net-misc/hylafax/Manifest
index 63eb01b67476..478e48dc54d4 100644
--- a/net-misc/hylafax/Manifest
+++ b/net-misc/hylafax/Manifest
@@ -1,10 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 99hylafax-4.2 75 RMD160 7556741a394736417cf3b9db352642b75996b54f SHA1 7544e149ac495b06be039869686c673d8ac8c0f1 SHA256 0cdc13f4db03ad4ca97be8d7671d49da947660ec071fc99786f68e440c3b0e84
 MD5 fa83948864d83f34f54ce35f26b38ed6 files/99hylafax-4.2 75
 RMD160 7556741a394736417cf3b9db352642b75996b54f files/99hylafax-4.2 75
 SHA256 0cdc13f4db03ad4ca97be8d7671d49da947660ec071fc99786f68e440c3b0e84 files/99hylafax-4.2 75
+AUX gentoo-gcc-version.patch 531 RMD160 26ba57b0df2e8bd9b5eaf77f7434da2563345c64 SHA1 0a9fd0254e3b0ed1c85deb2c7efb1ce06b040381 SHA256 7736dfc09d25b49530dac45a297fa7dcebdc445e95e5bcd24a2dd08816eaa79d
+MD5 841015893511c6b711de47cee0544257 files/gentoo-gcc-version.patch 531
+RMD160 26ba57b0df2e8bd9b5eaf77f7434da2563345c64 files/gentoo-gcc-version.patch 531
+SHA256 7736dfc09d25b49530dac45a297fa7dcebdc445e95e5bcd24a2dd08816eaa79d files/gentoo-gcc-version.patch 531
 AUX hylafax-4.2 3759 RMD160 d8a10429e912eaace4af98ee306c14b3f59ca7b4 SHA1 b41d462b94851544ce2e52b751ab956003a4e06a SHA256 83f1ba9a169f24721a4115dda3f3924c14804a09be2ff284fa52caeee455d166
 MD5 491e78765b433d7c11146120cf7e40f8 files/hylafax-4.2 3759
 RMD160 d8a10429e912eaace4af98ee306c14b3f59ca7b4 files/hylafax-4.2 3759
@@ -17,6 +18,14 @@ 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
+AUX hylafax.cron 90 RMD160 f878c323b324ba0300e9fce3b503f6b6c5aae23a SHA1 433b6214047b8d6af2e9f4896abd73ecab3c1d9c SHA256 6cf311f1c43cfc69e3f9de459fb05d660738269dbcc937c699eff44a5e5ab343
+MD5 70c2ae896a2bc4cb6f4382bfd1654881 files/hylafax.cron 90
+RMD160 f878c323b324ba0300e9fce3b503f6b6c5aae23a files/hylafax.cron 90
+SHA256 6cf311f1c43cfc69e3f9de459fb05d660738269dbcc937c699eff44a5e5ab343 files/hylafax.cron 90
+AUX hylafax.modules 39 RMD160 77d909fe5f26df2613dcc8a13b3b8091cecccf84 SHA1 21a05b08d720df828a7116ee26ddce95545e747a SHA256 4910721097093285757ea09cc9bd31cd35ea4ec58ef58a041c50a25f8cfc7a67
+MD5 7fb810fca013e0f8954bcc893ede2958 files/hylafax.modules 39
+RMD160 77d909fe5f26df2613dcc8a13b3b8091cecccf84 files/hylafax.modules 39
+SHA256 4910721097093285757ea09cc9bd31cd35ea4ec58ef58a041c50a25f8cfc7a67 files/hylafax.modules 39
 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
 DIST hylafax-4.3.1.tar.gz 1498444 RMD160 1a29d43a05793ec4185c96ca16698268ae3f7c9b SHA1 9b42872912f2b75949423b76ab5f1b5e2caef869 SHA256 b777c0d8f1f858f3c86f91f9ae4fde9246646ac9e753154b969cb7c3a49947ab
@@ -24,18 +33,18 @@ EBUILD hylafax-4.2.5.ebuild 4068 RMD160 7450dc736a394e16abb78cf0be653ec4cd9bcfff
 MD5 77094759e29b2f42e9e341964ebffcaa hylafax-4.2.5.ebuild 4068
 RMD160 7450dc736a394e16abb78cf0be653ec4cd9bcfff hylafax-4.2.5.ebuild 4068
 SHA256 37ea5762a0cb3340cbaf57091e55cedf09626b5eafe3bcb1d8c8854f661b1ffb hylafax-4.2.5.ebuild 4068
-EBUILD hylafax-4.3.0.ebuild 4434 RMD160 0dab286721fa2aab47a1b38f7e7c1359e41ceec3 SHA1 6dc433e66db5b2f06afdd37c152adf7b194e2bad SHA256 af67f0961f6c118f1cecac6a0fd010b82ba6c569a6238e218044dab6382d0e41
-MD5 fac55f7ffb4c5e8a12940a6d175c5e0c hylafax-4.3.0.ebuild 4434
-RMD160 0dab286721fa2aab47a1b38f7e7c1359e41ceec3 hylafax-4.3.0.ebuild 4434
-SHA256 af67f0961f6c118f1cecac6a0fd010b82ba6c569a6238e218044dab6382d0e41 hylafax-4.3.0.ebuild 4434
-EBUILD hylafax-4.3.1.ebuild 4235 RMD160 992444be9ecbcbfdffc1aaf89ea578d13f707362 SHA1 836b5151f023ee4d514119fa18fcd28fba264c66 SHA256 30bea007d5bd90069a0a32239112fe62b3b6c70fefcc94b6d1aefdb134f156ed
-MD5 6fa97923f51de5a0e2586254ccd9b493 hylafax-4.3.1.ebuild 4235
-RMD160 992444be9ecbcbfdffc1aaf89ea578d13f707362 hylafax-4.3.1.ebuild 4235
-SHA256 30bea007d5bd90069a0a32239112fe62b3b6c70fefcc94b6d1aefdb134f156ed hylafax-4.3.1.ebuild 4235
-MISC ChangeLog 15924 RMD160 4127b959b1450cf379c6cb777b6ccaea9ba52ed8 SHA1 9e09f16300d4dc5b7afc66af851615aa06f61503 SHA256 41c49cedb9635d7a30ff8382823a29664d5342341001259f2a945e963dbf0228
-MD5 4b1788acad5e8fc1477859ae398c4ba4 ChangeLog 15924
-RMD160 4127b959b1450cf379c6cb777b6ccaea9ba52ed8 ChangeLog 15924
-SHA256 41c49cedb9635d7a30ff8382823a29664d5342341001259f2a945e963dbf0228 ChangeLog 15924
+EBUILD hylafax-4.3.0.ebuild 4507 RMD160 eaad2e063eddf7c026c6dbd2ad3a6657125f635b SHA1 97aa122e00cd0a0abdf28c237f7d310a6b3ebb15 SHA256 16828baea041494185c910fce8ecbd69ee758d666e85f8ec09af046d5a610f4e
+MD5 22dd0c1acf98e61d216e38abbf62a007 hylafax-4.3.0.ebuild 4507
+RMD160 eaad2e063eddf7c026c6dbd2ad3a6657125f635b hylafax-4.3.0.ebuild 4507
+SHA256 16828baea041494185c910fce8ecbd69ee758d666e85f8ec09af046d5a610f4e hylafax-4.3.0.ebuild 4507
+EBUILD hylafax-4.3.1.ebuild 4890 RMD160 37795882725107c7ddb64b3fe33c0799c23c6b38 SHA1 0e695330bb9c85e9a5d02fa8b61079589579497d SHA256 e1d066aace4e559f00c1ce7285a439ef949eb96608f4b4bd767c496e960eefd0
+MD5 4d77c9678421f68a81e1a5dbbe3b470d hylafax-4.3.1.ebuild 4890
+RMD160 37795882725107c7ddb64b3fe33c0799c23c6b38 hylafax-4.3.1.ebuild 4890
+SHA256 e1d066aace4e559f00c1ce7285a439ef949eb96608f4b4bd767c496e960eefd0 hylafax-4.3.1.ebuild 4890
+MISC ChangeLog 16423 RMD160 1ead66278cda5c6bc146f6292521986a75c9440e SHA1 1f5e748957b1efd07440f3b793e314f5f7017095 SHA256 c3cd28c2fd703a400f24fd659ae53f2f94b1cda71d323771b53499b259d43680
+MD5 45005d0571c359766fa56d2d14495a65 ChangeLog 16423
+RMD160 1ead66278cda5c6bc146f6292521986a75c9440e ChangeLog 16423
+SHA256 c3cd28c2fd703a400f24fd659ae53f2f94b1cda71d323771b53499b259d43680 ChangeLog 16423
 MISC metadata.xml 680 RMD160 f534f59f38ba9db8b9ec24d72164ef99e90d0e55 SHA1 927f92ce08fdd3c4018e0d231afa81265c4d2525 SHA256 2b5b94cc0d6e9c9cfcc5b8908abb649de267dbc9f4fc2e949a246f79745cf5fd
 MD5 4cb9907739cd9b93d9563d64b0919ee1 metadata.xml 680
 RMD160 f534f59f38ba9db8b9ec24d72164ef99e90d0e55 metadata.xml 680
@@ -49,10 +58,3 @@ SHA256 046b78215a05bab017ee4aae5643452c2173a969bdf51faacf1b07c9bc60ce5a files/di
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGM8r1V3J2n04EauwRAqm8AKDcTCWpPMIgvGET9S74N/zigapYPgCgiQwV
-iL7CsjSZVAy9CtgFdzSMJkY=
-=Mt8f
------END PGP SIGNATURE-----
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
 }