aboutsummaryrefslogtreecommitdiff
path: root/network
diff options
context:
space:
mode:
Diffstat (limited to 'network')
-rw-r--r--network/hylafax/README34
-rw-r--r--network/hylafax/README.SLACKWARE27
-rw-r--r--network/hylafax/config.local.in (renamed from network/hylafax/config.local)58
-rw-r--r--network/hylafax/doinst.sh37
-rw-r--r--network/hylafax/hylafax.SlackBuild75
-rw-r--r--network/hylafax/hylafax.info10
6 files changed, 134 insertions, 107 deletions
diff --git a/network/hylafax/README b/network/hylafax/README
index 3a3b4ee90fc6d..ab92701ff5226 100644
--- a/network/hylafax/README
+++ b/network/hylafax/README
@@ -4,36 +4,4 @@ is designed around a client-server architecture. Fax modems may
reside on a single machine on a network and clients can submit
an outbound job from any other machine on the network.
-Client software is designed to be lightweight and easy to port.
-
-
-If you need to start hylafax at boot
-edit /etc/rc.d/rc.local and add the lines:
-
-script:
-# Starting the HylaFAX hfaxd and faxq Daemons at Boot.
- if [ -x /etc/rc.d/rc.hylafax ]; then
- /etc/rc.d/rc.hylafax start
- fi
-
-Edit /etc/inittab and add a line(s) similar to:
-
-m0:2345:respawn:/usr/libexec/hylafax/faxgetty ttyS0
-
-where 'm0' is unique in inittab and 'ttyS0' matches the device
-name(s) used at the outset of the faxaddmodem script.
-
-With root permissions, execute '/usr/sbin/faxsetup'.
-When finished, faxsetup will automatically run faxaddmodem
-for you. Generally, you can follow all of the defaults
-except those for FaxMaster, the local fax number(s), TSI,
-and any modem-specific information in faxaddmodem.
-
-It would be wise to run faxcron and faxqclean regularly
-from cron so that the queue directories do not clutter
-up and fill the storage device. Many installations run
-faxqclean every hour and faxcron every day. Insert
-something like this into your uucp or root crontab file:
-
-0 * * * * /usr/sbin/faxqclean
-0 0 * * * /usr/sbin/faxcron | mail -s "HylaFAX Usage Report" faxmaster
+See /usr/doc/hylafax-6.0.2/README.SLACKWARE for configuration hints.
diff --git a/network/hylafax/README.SLACKWARE b/network/hylafax/README.SLACKWARE
new file mode 100644
index 0000000000000..10f1904c5418e
--- /dev/null
+++ b/network/hylafax/README.SLACKWARE
@@ -0,0 +1,27 @@
+/usr/doc/hylafax-@VERSION@/README.SLACKWARE
+
+If you need to start hylafax at boot, add this to /etc/rc.d/rc.local:
+
+ # Starting the HylaFAX hfaxd and faxq Daemons at Boot.
+ if [ -x /etc/rc.d/rc.hylafax ]; then
+ /etc/rc.d/rc.hylafax start
+ fi
+
+Edit /etc/inittab and add a line similar to:
+ m0:2345:respawn:/usr/libexec/hylafax/sbin/faxgetty ttyS0
+where 'm0' is unique in inittab and 'ttyS0' matches the device
+name(s) used at the outset of the faxaddmodem script.
+
+With root permissions, execute '/usr/sbin/faxsetup'.
+When finished, faxsetup will automatically run faxaddmodem for you.
+Generally, you can follow all of the defaults except those for FaxMaster,
+the local fax number(s), TSI, and any modem-specific information in
+faxaddmodem.
+
+It would be wise to run faxcron and faxqclean regularly from cron so that
+the queue directories do not clutter up and fill the storage device. Many
+installations run faxqclean every hour and faxcron every day. Insert
+something like this into your uucp or root crontab file:
+ 0 * * * * /usr/sbin/faxqclean
+ 0 0 * * * /usr/sbin/faxcron | mail -s "HylaFAX Usage Report" faxmaster
+
diff --git a/network/hylafax/config.local b/network/hylafax/config.local.in
index bd6d72af647a8..20412e22fe967 100644
--- a/network/hylafax/config.local
+++ b/network/hylafax/config.local.in
@@ -1,4 +1,4 @@
-# $Id: config.site,v 1.14 2007/06/21 19:21:45 aidan Exp $
+# $Id: config.site,v 1.24 2009/04/23 12:45:30 aidan Exp $
#
# HylaFAX Facsimile Software
#
@@ -46,25 +46,26 @@
#PS="auto" # PostScript support to use (auto|gs|dps|imp)
#SGI2FAX="auto" # configure SGI image support (auto|yes|no)
#DPS="no" # install SGI DPS-based RIP (yes|no)
-GS="yes" # install Ghostscript RIP (yes|no)
+GS="no" # install Ghostscript RIP (yes|no)
#IMP="no" # install SGI Impressario 2.1 support (yes|no)
#REGEX="yes" # use distributed regular expression package
#UTMP="utmpx" # type of utmp+wtmp handling (auto|utmp|utmpx)
-#DBLIB="no" # use distributed libdb distribution
+#NLS="auto" # enable NLS support (auto|yes|no)
#
# Directory parameters.
#
DIR_BIN="/usr/bin" # directory for client apps
-DIR_LIB="/usr/lib" # directory for libfaxserver, libfaxutil
-DIR_LIBDATA="/usr/lib/hylafax" # directory for client data
+DIR_LIB="/usr/lib@LIBDIRSUFFIX@" # directory for libfaxserver, libfaxutil
+DIR_LIBDATA="/usr/lib@LIBDIRSUFFIX@/hylafax" # directory for client data
DIR_LIBEXEC="/usr/libexec/hylafax" # directory for libraries&hidden apps
+DIR_LOCALE='/usr/share/locale'
DIR_MAN="/usr/man" # directory for manual pages
DIR_SPOOL="/var/spool/hylafax" # directory for spooling area
DIR_SBIN="/usr/sbin" # directory for system apps
#DIR_LOCKS="/usr/spool/locks" # directory for UUCP lock files
#FONTMAP="/usr/share/ghostscript/3.33" # directorys containing Fontmap files
-#PATH_AFM="/usr/lib/DPS/AFM" # directorys for AFM files
+#PATH_AFM="/usr/lib@LIBDIRSUFFIX@/DPS/AFM" # directorys for AFM files
#
# Miscellaneous parameters.
@@ -81,10 +82,10 @@ SYSUID="root" # user ID for system installs
#PATH_GETTY="/etc/getty" # pathname of suitable getty program
#PATH_VGETTY="/bin/vgetty" # pathname of voice getty program
#PATH_EGETTY="/bin/egetty" # pathname of external getty program
-#PATH_SENDMAIL="/usr/lib/sendmail" # pathname of suitable sendmail program
+#PATH_SENDMAIL="/usr/lib@LIBDIRSUFFIX@/sendmail" # pathname of suitable sendmail program
PATH_GSRIP="/usr/bin/gs" # pathname of Ghostscript-based RIP
#PATH_DPSRIP="/var/spool/hylafax/bin/ps2fax.exe" # pathname of DPS-based RIP
-#PATH_IMPRIP="/usr/lib/print/psrip" # pathname of Impressario 2.1 RIP
+#PATH_IMPRIP="/usr/lib@LIBDIRSUFFIX@/print/psrip" # pathname of Impressario 2.1 RIP
#MANSCHEME="sysv-source-cat-strip" # manual page installation scheme
SYSVINIT="auto" # install SysV-style init support (auto|yes|no)
DIR_SYSVINIT="/etc/rc.d" # location of SysV-style init script
@@ -94,7 +95,6 @@ NAME_SYSVINITSTART="rc.hylafax" # name of SysV-style start script
NAME_SYSVINITSTOP="rc.hylafax" # name of SysV-style stop script
FAXQ_SERVER=yes # init script starts faxq
HFAXD_SERVER=yes # init script starts hfaxd
-HFAXD_OLD_PROTOCOL=no # don't start old protocol
HFAXD_SNPP_SERVER=no # don't start paging protocol
# SVR4 packaging stuff
@@ -127,22 +127,22 @@ HFAXD_SNPP_SERVER=no # don't start paging protocol
#LIBSUN="auto" # yes|no|auto configure -lsun use
#LLDOPTS="" # extra link line options
#MACHDEPLIBS="" # extra libraries for linking
-#OPTIMIZER="-O2 -march=i486 -mtune=i686" # optimizer flags
+#OPTIMIZER="-O" # optimizer flags
#PORTFUNCS="" # non-standard functions to emulate
#PROTOTYPES="-prototypes" # C compiler options for checking function prototypes
#RANLIB=":" # pathname of suitable ranlib program
#SHDLIBC="-lc_s" # shared C library, if not standard
#SIGHANDLERTYPES='(void(*)(int,...))' # types to check for signal handler
#STRIP="/bin/strip" # strip program used by install.sh
-GLDOPTS="-L/usr/lib"
+
#
# The source for the TIFF library is not required
# to build this software, but the library is required
# to link against. If libtiff is installed in a
# non-standard location then setup LIBTIFF accordingly.
#
-LIBTIFF="-L/usr/lib -ltiff" # linkage convention for libtiff
-TIFFINC="/usr/include" # place to find tiffio.h
+LIBTIFF="-L/usr/lib@LIBDIRSUFFIX@ -ltiff" # linkage convention for libtiff
+TIFFINC="-I/usr/include" # place to find tiffio.h
TIFFBIN="/usr/bin" # where TIFF tools live
#
@@ -151,7 +151,7 @@ TIFFBIN="/usr/bin" # where TIFF tools live
# to link against. If ZLIB is installed in a
# non-standard location then setup LIBZ accordingly.
#
-LIBZ="-L/usr/lib -lz" # linkage convention for libz
+LIBZ="-L/usr/lib@LIBDIRSUFFIX@ -lz" # linkage convention for libz
ZLIBINC="-I/usr/include" # place to find zlib.h
#
@@ -161,25 +161,21 @@ ZLIBINC="-I/usr/include" # place to find zlib.h
# that is included in this distribution is not to be used
# then set REGEX=no and supply the following definitions.
#
-LIBREGEX=" " # linkage convention for regex package
-REGEXINC="/usr/include" # place to find regex.h
+#LIBREGEX="" # linkage convention for regex package
+#REGEXINC="-I/usr/include" # place to find regex.h
#
-# The LIBDB hashed database package is (currently) used
-# only by the MLA tools that are not publicly available
-# but which are built from within this source tree. In
-# the future the fax software may use the libdb software
-# for the remote client capabilities database (so these
-# hooks are included now).
-#
-# The source for the LIBDB hashed database package
-# is not required to build this software, but the package
-# is required to link against. If the copy of the software
-# that is included in this distribution is not to be used
-# then set DBLIB=no and supply the following definitions.
-#
-LIBDB=" " # linkage convention for libdb package
-DBLIBINC="/usr/include" # place to find db.h
+# NLS (gettext) library support is used by default if it's found
+# xgettext is not required to build this software, but if you try
+# and rebuild the message template catalogs, you will need it. Some
+# platforms may need extra options to link for libintl as well.
+#
+INTLINC="-I/usr/include"
+#LIBINTL="" # configure will try LIBINTL="-lintl"
+#XGETTEXT="xgettext --foreign-user -ctranslator --no-wrap --sort-by-file --omit-header --strict --indent --force-po"
+#MSGMERGE="msgmerge --no-wrap --sort-by-file"
+#MSGFMT=msgfmt
+#MSGCAT=msgcat
#
# Parameters to control various workarounds for system bugs.
diff --git a/network/hylafax/doinst.sh b/network/hylafax/doinst.sh
new file mode 100644
index 0000000000000..33d3c9deca399
--- /dev/null
+++ b/network/hylafax/doinst.sh
@@ -0,0 +1,37 @@
+config() {
+ NEW="$1"
+ OLD="`dirname $NEW`/`basename $NEW .new`"
+
+ # If there's no config file by that name, mv it over:
+ if [ ! -r $OLD ]; then
+ mv $NEW $OLD
+ elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+ rm $NEW
+ fi
+ # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+# Keep same perms on rc.hylafax.new:
+if [ -e etc/rc.d/rc.hylafax ]; then
+ cp -a etc/rc.d/rc.hylafax etc/rc.d/rc.hylafax.new.incoming
+ cat etc/rc.d/rc.hylafax.new > etc/rc.d/rc.hylafax.new.incoming
+ mv etc/rc.d/rc.hylafax.new.incoming etc/rc.d/rc.hylafax.new
+else
+ # Install executable otherwise - irrelevant unless user starts in rc.local
+ chmod 0755 etc/rc.d/rc.hylafax.new
+fi
+
+config etc/rc.d/rc.hylafax.new
+config var/spool/hylafax/etc/dialrules.new
+config var/spool/hylafax/etc/dialrules.europe.new
+config var/spool/hylafax/etc/dialrules.sf-ba.new
+config var/spool/hylafax/etc/dpsprinter.ps.new
+config var/spool/hylafax/etc/hosts.hfaxd.new
+
+# We warn about needed configuration to the /etc/inittab file.
+printf "\nThe following line will need be added to your /etc/inittab:
+please check if it is the correct tty device for the modem,
+and if not, change it to the correct one.
+ m0:23:respawn:/usr/libexec/hylafax/faxgetty ttyS0\n\n"
+# Hylafax faxgetty activation
+
diff --git a/network/hylafax/hylafax.SlackBuild b/network/hylafax/hylafax.SlackBuild
index 4ec163c7f9f0a..d6fbdc98c3fe2 100644
--- a/network/hylafax/hylafax.SlackBuild
+++ b/network/hylafax/hylafax.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for hylafax
-# Copyright 2007 David Somero <dsomero@hotmail.com>
+# Copyright 2007 David Somero (dsomero@hotmail.com) Athens,TN USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -21,18 +21,15 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
+
# 2007.08.07
# Alan Hicks <alan@lizella.net>
# General script clean-up and minor improvements
-#
-
-set -e
PRGNAM=hylafax
-VERSION=4.4.4
+VERSION=${VERSION:-6.0.2}
ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
CWD=$(pwd)
@@ -40,20 +37,24 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "${ARCH}" = "i486" ]; then
+if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
fi
+set -e
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
-
cd $PRGNAM-$VERSION
chown -R root:root .
find . \
@@ -63,54 +64,52 @@ find . \
-exec chmod 644 {} \;
# Copy our source for the correct configuration
-cp $CWD/config.local $TMP/$PRGNAM-$VERSION/config.local
+sed "s|@LIBDIRSUFFIX@|${LIBDIRSUFFIX}|g" \
+ < $CWD/config.local.in \
+ > $TMP/$PRGNAM-$VERSION/config.local
CFLAGS="${SLKCFLAGS}" \
CXXFLAGS="${SLKCFLAGS}" \
-./configure \
+./configure \
+ --target=$ARCH-slackware-linux \
--nointeractive \
- --disable-pam \
+ --disable-pam \
--with-optmizer=${CFLAGS}
make
mkdir -p $PKG/etc/rc.d
make install ROOT=$PKG
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a INSTALL COPYRIGHT CONTRIBUTORS README TODO VERSION doc/* $PKG/usr/doc/$PRGNAM-$VERSION
-chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
-
-# We need to move the etc/rc.d/hylafax to the rc.hylafax file and make it executable.
-mv $PKG/etc/rc.d/hylafax $PKG/etc/rc.d/rc.hylafax
-chmod 755 $PKG/etc/rc.d/rc.hylafax
-
-( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
- find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
# Compress man pages
( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+ find . -type f -exec gzip -9 {} \;
+ for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
)
+mv $PKG/etc/rc.d/hylafax $PKG/etc/rc.d/rc.hylafax.new
+( cd $PKG/var/spool/hylafax/etc
+ mv dialrules dialrules.new
+ mv dialrules.europe dialrules.europe.new
+ mv dialrules.sf-ba dialrules.sf-ba.new
+ mv dpsprinter.ps dpsprinter.ps.new
+ mv hosts.hfaxd hosts.hfaxd.new
+)
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+ INSTALL COPYRIGHT CONTRIBUTORS README TODO VERSION doc/* \
+ $PKG/usr/doc/$PRGNAM-$VERSION
+sed "s%@VERSION@%$VERSION%g" $CWD/README.SLACKWARE > \
+ $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/slack-desc > $PKG/usr/doc/$PRGNAM-$VERSION/slack-desc
+chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
-
-# add a configuration notice
-cat << EOF >> $PKG/install/doinst.sh
-# We warn about needed configuration to the /etc/inittab file.
-echo "The following line will need be added to your /etc/inittab,"
-echo "please check if its the correct tty device for the modem, "
-echo "and in case change it to the correct one."
-echo " "
-echo "m0:23:respawn:/usr/libexec/hylafax/faxgetty ttyS0"
-# Hylafax faxgetty activation
-EOF
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/network/hylafax/hylafax.info b/network/hylafax/hylafax.info
index a4d4b5e97bb83..4934c5bb8e00c 100644
--- a/network/hylafax/hylafax.info
+++ b/network/hylafax/hylafax.info
@@ -1,8 +1,8 @@
PRGNAM="hylafax"
-VERSION="4.4.4"
+VERSION="6.0.2"
HOMEPAGE="http://www.hylafax.org"
-DOWNLOAD="ftp://ftp.hylafax.org/source/hylafax-4.4.4.tar.gz"
-MD5SUM="4beb3d438ca6c4f00f1d94f9643e6668"
+DOWNLOAD="ftp://ftp.hylafax.org/source/hylafax-6.0.2.tar.gz"
+MD5SUM="2ab173a3bd50c8ca68d2c84f6e416d52"
MAINTAINER="David Somero"
-EMAIL="dsomero@hotmail.com "
-APPROVED="Erik Hanson"
+EMAIL="dsomero@hotmail.com"
+APPROVED="rworkman"