New package, hylafax plus, that is based on upstream fork of hylafax. Initial ebuilds were user submitted (Thanks to all those who contributed to bug 168890). I have made a number of modifications/fixes and have removed all keywords(package is masked). Ebuild now gets through repoman w/o any qa concerns but I will need to continue to revise it until it is ready to keyword as ~amd64 and ~x86 for user testing.

(Portage version: 2.1.10.55/cvs/Linux x86_64)

3 files changed, 215 insertions, 0 deletions

diff --git a/net-misc/hylafaxplus/files/hylafaxplus-conf b/net-misc/hylafaxplus/files/hylafaxplus-conf
new file mode 100644
index 000000000000..911a59db4078
--- /dev/null
+++ b/net-misc/hylafaxplus/files/hylafaxplus-conf
@@ -0,0 +1,29 @@
+# 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/hylafaxplus/files/hylafaxplus-init b/net-misc/hylafaxplus/files/hylafaxplus-init
new file mode 100644
index 000000000000..47c16fdff2f2
--- /dev/null
+++ b/net-misc/hylafaxplus/files/hylafaxplus-init
@@ -0,0 +1,176 @@
+#!/sbin/runscript
+# Copyright 1999-2012 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/hylafaxplus/files/ldconfig-patch b/net-misc/hylafaxplus/files/ldconfig-patch
new file mode 100644
index 000000000000..8b0f4352d51f
--- /dev/null
+++ b/net-misc/hylafaxplus/files/ldconfig-patch
@@ -0,0 +1,10 @@
+--- faxd/Makefile.LINUXdso.original	2011-12-30 18:17:59.000000000 +0100
++++ faxd/Makefile.LINUXdso	2011-12-30 18:18:51.000000000 +0100
+@@ -37,7 +37,6 @@
+ 
+ installDSO: libfaxserver.${DSO}
+ 	${PUTSERV} -root ${INSTALLROOT} -F ${LIBDIR} -m 755 -O libfaxserver.${DSO}
+-	[ `id -u` -eq 0 ] && ( PATH=${PATH}:/sbin ldconfig ${LIBDIR} ) || ( echo "ldconfig is required to be run as user root at install time" )
+ 
+ uninstallDSO::
+ 	${RM} -f ${LIBDIR}/libfaxserver.${DSO}