Rev-bump for new init script and conf.d configuration (keywords

maintained).
Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.7 x86_64
RepoMan-Options: --force

5 files changed, 227 insertions, 6 deletions

diff --git a/net-misc/hylafax/ChangeLog b/net-misc/hylafax/ChangeLog
index 5afcd6f60a51..be09eb23f4d2 100644
--- a/net-misc/hylafax/ChangeLog
+++ b/net-misc/hylafax/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-misc/hylafax
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.89 2008/12/16 15:35:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.90 2008/12/19 23:45:43 nerdboy Exp $
+
+*hylafax-4.4.4-r2 (19 Dec 2008)
+
+  19 Dec 2008; Steve Arnold <nerdboy@gentoo.org> +files/hylafax.conf,
+  +files/hylafax.init, -hylafax-4.4.4-r1.ebuild, +hylafax-4.4.4-r2.ebuild:
+  Another rev-bump is warranted due to new and more Gentoo-conformant init 
+  and conf setup; the previous init script got borked a while back by 
+  other init changes, and as we all know, not everyone has the proper 
+  hardware to fully test this package.  Current keywords are being kept
+  so as not to overly annoy the arch testers (proper operation needs to
+  be verified by a sysadmin with real fax-modem hardware).  The init
+  script now dies correctly if no setup.cache is found.
 
   16 Dec 2008; Jeroen Roovers <jer@gentoo.org> hylafax-4.4.4-r1.ebuild:
   Stable for HPPA (bug #245190).
diff --git a/net-misc/hylafax/Manifest b/net-misc/hylafax/Manifest
index 3586bca912af..eb7ab028e3c2 100644
--- a/net-misc/hylafax/Manifest
+++ b/net-misc/hylafax/Manifest
@@ -3,7 +3,9 @@ AUX gentoo-gcc-version.patch 531 RMD160 26ba57b0df2e8bd9b5eaf77f7434da2563345c64
 AUX hylafax-4.2 3759 RMD160 d8a10429e912eaace4af98ee306c14b3f59ca7b4 SHA1 b41d462b94851544ce2e52b751ab956003a4e06a SHA256 83f1ba9a169f24721a4115dda3f3924c14804a09be2ff284fa52caeee455d166
 AUX hylafax-4.2.5-tiff_version.patch 906 RMD160 08eec1d890c3aaeffbfa7d211481538fb1f2350b SHA1 b2bb8e52f70d4d465a0b8f79a79fd16b5c190574 SHA256 6c195c06664fae498185a9cb420fe76f8b479b6f09da92422a8559202e03fb38
 AUX hylafax-fix-configure-gcc-3-4.patch 290 RMD160 7a6e436be11bca58cc49d03e8ab18746b48ac4d1 SHA1 66e1224901d20c0a9c92abf6b7a2078051954b91 SHA256 48f6ba6fdfa9cef81f765c5a11e87fdbeaf158ad26c48fb228c612a2c7578715
+AUX hylafax.conf 573 RMD160 095aabd5a883aef16f0b130d6a8ff5067fb89f70 SHA1 23502ca8f27226298bd91eaf3bea53a34b622d18 SHA256 6613e8a7b007a627b95259ea2bfafeb8c8886088381f4c519a37213919a2ad13
 AUX hylafax.cron 90 RMD160 f878c323b324ba0300e9fce3b503f6b6c5aae23a SHA1 433b6214047b8d6af2e9f4896abd73ecab3c1d9c SHA256 6cf311f1c43cfc69e3f9de459fb05d660738269dbcc937c699eff44a5e5ab343
+AUX hylafax.init 3139 RMD160 ea6a2b0f6a203477f3081bec5be0dfb10b722d5b SHA1 8407f7a9088fdbbaf31f551d12041d65282be9d8 SHA256 2bd5f1b523a216eca5570e8786b410a158bcf95d35030e45c21eb3128853496e
 AUX hylafax.modules 39 RMD160 77d909fe5f26df2613dcc8a13b3b8091cecccf84 SHA1 21a05b08d720df828a7116ee26ddce95545e747a SHA256 4910721097093285757ea09cc9bd31cd35ea4ec58ef58a041c50a25f8cfc7a67
 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
@@ -14,6 +16,6 @@ EBUILD hylafax-4.2.5.ebuild 4339 RMD160 06384897be4776b452d7d7139bdda097f976a76f
 EBUILD hylafax-4.3.0.ebuild 4551 RMD160 a0450e170eae096e28270001586d0dfb7541fca3 SHA1 9cb0032df385a65fe6ee09d9d262f92845574a70 SHA256 7a3c2efb5a2ed011abcfcd9674735f15d525203dd5909997e42eca53a398934c
 EBUILD hylafax-4.3.1.ebuild 5562 RMD160 55cca50f2b59f1d8308e3d1992f046b024206939 SHA1 143bde56282ce4512f3e76327f8dcc8e46ff893f SHA256 edc010502f8c61faea1d6299f49712c6daf7d6caff436f5274707112ab3c819e
 EBUILD hylafax-4.3.7.ebuild 5553 RMD160 9e238ce27540cb8207d78f70dfe3e3149f6ed78b SHA1 48b19567813a4059127630153983ee5e4e5919a3 SHA256 6a270fc72238cd97c11ef37369587255504fe6121277aca048b1193688016208
-EBUILD hylafax-4.4.4-r1.ebuild 5403 RMD160 a4ef9d0d52a1fef2a389ecce2aa16a7b17fa5c30 SHA1 40271d3ea085efd75448420a621385370645df90 SHA256 0cfb3a9cd34fc12e27c15e3240a0aeef11be6aba1d328f346fd1ef8553f1578c
-MISC ChangeLog 18246 RMD160 2473aff5f49daff466bfbd1d623f5a16c74996b3 SHA1 9e7d6f5d1b92a43ac9f5670b9693957d78769ece SHA256 a408e124f52a2fabf4f51b4dc377ae76cfb4debdf1791970e344f66fae634e87
+EBUILD hylafax-4.4.4-r2.ebuild 5462 RMD160 c9fc17423d58447c69f71d49bafce85a861399d3 SHA1 a6e5bb79029cbfa3d77c328150f263769fcc68c1 SHA256 4fb33a39fbc5090d0ef1f5e8e45e98e04d9e23b07bde751d664359ad15f78ea4
+MISC ChangeLog 18916 RMD160 373d60cc892e277e0fe6a5e2678397acaf30ac70 SHA1 51d756b272ea9a30684cb8ed146873aef2d18fc1 SHA256 9c2486f1fbdac27f76227efa4706ce60db61f3f028c84f0c2b3baceca54f5acc
 MISC metadata.xml 891 RMD160 41e3283571a1e5c8e5d1f1b70775112518e26919 SHA1 86f8807fce2cd0778417ee94f60d5cbae0b1d6b6 SHA256 31d4e6822bcf14a6664834df99d98a88f382b5fb3eddfd2995a2e06ba79f23a8
diff --git a/net-misc/hylafax/files/hylafax.conf b/net-misc/hylafax/files/hylafax.conf
new file mode 100644
index 000000000000..903707d077c3
--- /dev/null
+++ b/net-misc/hylafax/files/hylafax.conf
@@ -0,0 +1,30 @@
+# Spool directory for HylaFAX
+spooldir="/var/spool/fax"
+
+# Faxq program path
+faxq="/usr/sbin/faxq"
+
+# hfaxd program path
+hfaxd="/usr/sbin/hfaxd"
+
+# faxgetty program path
+faxgetty="/usr/sbin/faxgetty"
+
+# Port of the hfaxd daemon for new protocol
+faxport=hylafax
+
+# Address used by hfaxd as binding address.
+faxbind="127.0.0.1"
+
+# Port of the hfaxd daemon for SNPP protocol
+snppport=444
+
+# Port of the hfaxd daemon for old protocol
+oldprotoport=4557
+
+# newproto | oldproto | snpp | any
+mode="newproto"
+
+# Directory where the pidfiles of HylaFAX are saved.
+piddir="/var/run"
+
diff --git a/net-misc/hylafax/files/hylafax.init b/net-misc/hylafax/files/hylafax.init
new file mode 100644
index 000000000000..b368338a8cec
--- /dev/null
+++ b/net-misc/hylafax/files/hylafax.init
@@ -0,0 +1,176 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Author Geaaru
+# Distributed under the terms of the GNU General Public License v2
+
+opts="zap"
+
+depend() {
+	use lo
+}
+
+checkconfig() {
+	ebegin "Check hylafax server configuration..."
+
+	if [ x$spooldir == x ] ; then
+		eerror "No spooldir directory defined"
+		return 1
+	else
+		SPOOL=$spooldir
+		einfo "Use spool directory $SPOOL"
+	fi
+
+	if [ x$mode == x ] ; then
+		eerror "No mode defined"
+		return 1
+	fi
+
+	if [ ! -f $SPOOL/etc/setup.cache ] ; then
+		eerror "No $SPOOL/etc/setup.cache file founded. Use faxsetup command"
+		return 1
+	fi
+
+	if [[ x$hfaxd == x || ! -f $hfaxd ]] ; then
+		eerror "No hfaxd daemon founded"
+		return 1
+	fi
+
+	if [[ x$faxq == x || ! -f $faxq ]] ; then
+		eerror "No faxq program founded"
+		return 1
+	fi
+
+	if [[ x$faxgetty == x || ! -f $faxgetty ]] ; then
+		eerror "No faxgetty program founded"
+		return 1
+	fi
+
+	if [ x$faxbind == x ] ; then
+		eerror "No binding address supply"
+		return 1
+	fi
+
+	if [ x$piddir == x ] ; then
+		PIDDIR=$SPOOL
+	else
+		PIDDIR=$piddir
+	fi
+
+
+	hfaxd_args="-l $faxbind -q $SPOOL"
+
+	case $mode in
+		newproto)
+			if [[ x$faxport == x ]] ; then
+				eerror "No faxport defined"
+				return 1
+			fi
+			hfaxd_args="$hfaxd_args -i $faxport"
+			;;
+		oldproto)
+			if [[ x$oldprotoport == x ]] ; then
+				eerror "No oldprotoport defined"
+				return 1
+			fi
+			hfaxd_args="$hfaxd_args -o $oldprotoport"
+			;;
+		snpp)
+			if [[ x$snppport == x ]] ; then
+				eerror "No snppport defined"
+				return 1
+			fi
+			hfaxd_args="$hfaxd_args -s $snppport"
+			;;
+		any)
+			if [[ x$faxport == x || x$snppport == x || x$oldprotoport == x ]] ; then
+				eerror "No port data founded for old services"
+				return 1
+			fi
+			hfaxd_args="$hfaxd_args -i $faxport -s $snppport -o $oldprotoport"
+			;;
+		*)
+			eerror "Invalid mode"
+			return 1
+			;;
+
+	esac
+
+	faxq_args="-q $SPOOL"
+
+	# workaround for manage save of pidfile with start-stop-daemon
+	hfaxd_args="$hfaxd_args -d"
+	faxq_args="$faxq_args -D"
+		
+	return 0
+}
+
+start() {
+	local result
+
+	checkconfig || return 1
+
+	ebegin "Starting HylaFAX server daemons"
+
+	start_faxq
+	result=$?
+
+	if [ $result -ne 0 ]  ; then
+		eerror "Error on start $faxq daemon"
+		return 1
+	fi
+
+	start_hfaxd
+	result=$?
+
+	eend $result
+}
+
+start_hfaxd() {
+	local arguments="--start \
+			 --make-pidfile --pidfile $PIDDIR/hfaxd.pid"
+	
+	einfo "Starting $hfaxd with args $hfaxd_args"
+
+	start-stop-daemon -b ${arguments} --exec $hfaxd -- $hfaxd_args > /dev/null 2>&1
+
+	return $?;
+}
+
+start_faxq() {
+	local arguments="--start \
+			 --make-pidfile --pidfile $PIDDIR/faxq.pid"
+	einfo "Starting $faxq ... "
+
+	start-stop-daemon -b ${arguments} --exec $faxq -- $faxq_args > /dev/null 2>&1
+	
+	return $?
+}
+
+stop() {
+	checkconfig || return 1
+
+	ebegin "Stopping HylaFAX server daemons"
+	
+	start-stop-daemon --stop --quiet --pidfile $PIDDIR/hfaxd.pid
+	start-stop-daemon --stop --quiet --pidfile $PIDDIR/faxq.pid
+	eend $?
+}
+
+zap() {
+	checkconfig || return 1
+
+	ebegin "Zap HylaFAX server daemon files"
+
+	if [ -f $PIDFILE/hfaxd.pid ] ; then
+		rm -f $PIDFILE/hfaxd.pid
+	fi
+
+	if [ -f $PIDFILE/faxq.pid ] ; then
+		rm -f $PIDFILE/faxq.pid
+	fi
+}
+
+restart() {
+	stop
+	start
+}
diff --git a/net-misc/hylafax/hylafax-4.4.4-r1.ebuild b/net-misc/hylafax/hylafax-4.4.4-r2.ebuild
index d05a48b5aa12..440079eb717c 100644
--- a/net-misc/hylafax/hylafax-4.4.4-r1.ebuild
+++ b/net-misc/hylafax/hylafax-4.4.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.4.4-r1.ebuild,v 1.3 2008/12/16 15:35:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.4.4-r2.ebuild,v 1.1 2008/12/19 23:45:43 nerdboy Exp $
 
 inherit eutils multilib pam toolchain-funcs
 
@@ -141,8 +141,9 @@ src_install() {
 	einfo "Adding env.d entry for Hylafax"
 	doenvd 99${P}
 
-	einfo "Adding init.d entry for Hylafax"
-	newinitd "${FILESDIR}"/${PN}-4.2 ${PN}
+	einfo "Adding init.d and conf.d entries for Hylafax"
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
 
 	use pam && pamd_mimic_system hylafax auth account session