On 04/22/11 11:06, Giovanni Bechis wrote: > Hi, > this diff updates hylafax to version 6.0.5, this version adds pcl > support, ipv6 support, better permission handling in hfaxd and a lot of > bug fixes. better diff, full changelog available at: http://git.hylafax.org/HylaFAX?a=blob;f=doc/RELEASENOTES-6.0.txt;hb=6.0 Cheers Giovanni
Index: Makefile =================================================================== RCS file: /cvs/ports/comms/hylafax/Makefile,v retrieving revision 1.61 diff -u -p -r1.61 Makefile --- Makefile 29 Nov 2010 22:33:11 -0000 1.61 +++ Makefile 22 Apr 2011 09:19:05 -0000 @@ -1,15 +1,16 @@ # $OpenBSD: Makefile,v 1.61 2010/11/29 22:33:11 jasper Exp $ COMMENT= send/receive faxes and share modems -DISTNAME= hylafax-4.4.6 -REVISION= 1 +DISTNAME= hylafax-6.0.5 CATEGORIES= comms HOMEPAGE= http://www.HylaFAX.org/ MAINTAINER= Giovanni Bechis <[email protected]> -MASTER_SITES= ftp://ftp.hylafax.org/source/ +MASTER_SITES= ftp://ftp.hylafax.org/source/ \ + ftp://ftp.ntua.gr/pub/net/hylafax/source/ \ + ftp://mirror.aarnet.edu.au/pub/hylafax/source/ # License: BSD # http://www.hylafax.org/HylaFAQ/copyright.html @@ -22,6 +23,7 @@ FLAVORS= a4 FLAVOR?= WANTLIB= c jbig m stdc++ tiff util z +MODULES= devel/gettext BUILD_DEPENDS= print/ghostscript/gnu RUN_DEPENDS= mail/metamail @@ -34,13 +36,16 @@ USE_GROFF = Yes CONFIGURE_ARGS= --nointeractive \ --disable-pam \ + --disable-nls \ --with-CC="${CC}" \ --with-CXX="${CXX}" \ - --with-INSTALL="" + --with-INSTALL="" \ + --with-OPTIMIZER="" CONFIGURE_ENV+= CCOMPILER="${CC}" CXXCOMPILER="${CXX}" \ GCOPTS="${CFLAGS}" GCXXOPTS="${CXXFLAGS}" \ PREFIX="${PREFIX}" LOCALBASE="${LOCALBASE}" \ + INETDCONF=/etc/inetd.conf MKFIFO=/sbin/mkfifo \ SCRIPT_SH=/bin/ksh .if ${FLAVOR:L} == "a4" @@ -52,6 +57,6 @@ FAKE_FLAGS= ROOT=${WRKINST} SPOOL=${PREF NO_REGRESS= Yes pre-configure: - @perl -pi -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/configure + ${SUBST_CMD} ${WRKSRC}/configure .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/comms/hylafax/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 8 Jul 2010 16:21:17 -0000 1.6 +++ distinfo 22 Apr 2011 09:19:05 -0000 @@ -1,5 +1,5 @@ -MD5 (hylafax-4.4.6.tar.gz) = 9lqgIGbQXBmkHD4GTNaNQQ== -RMD160 (hylafax-4.4.6.tar.gz) = /HZCzV8STVTgifhg0fmbAML2ogM= -SHA1 (hylafax-4.4.6.tar.gz) = keEkxZLYIlK6tzf/YeotwfB+RFk= -SHA256 (hylafax-4.4.6.tar.gz) = 68RwPw4oxd84JQelGFqQvuOjPXV0UlZ6IqXQeicPU2E= -SIZE (hylafax-4.4.6.tar.gz) = 1168242 +MD5 (hylafax-6.0.5.tar.gz) = 65rJQjVK1wjiDkWDzsZhXw== +RMD160 (hylafax-6.0.5.tar.gz) = p1JSzu6pkbLmb70jBOW+Ck37jBQ= +SHA1 (hylafax-6.0.5.tar.gz) = wCuLXdEK6U41xClEjKmlGCsFnGg= +SHA256 (hylafax-6.0.5.tar.gz) = 2XytNtIdVaHiKnNtYzUKxm1TfUgebooYZxby3Px9Zyk= +SIZE (hylafax-6.0.5.tar.gz) = 1295267 Index: patches/patch-Makefile_in =================================================================== RCS file: patches/patch-Makefile_in diff -N patches/patch-Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Makefile_in 22 Apr 2011 09:19:05 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- Makefile.in.orig Fri Apr 22 10:35:47 2011 ++++ Makefile.in Fri Apr 22 10:40:45 2011 +@@ -232,7 +232,7 @@ makeServerDirs:: + -${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m ${DIRMODE} \ + -idb hylafax.sw.server -dir \ + -F ${SPOOL} bin client config dev etc info log recvq status +- -${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m 700 \ ++ -${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m 755 \ + -idb hylafax.sw.server -dir \ + -F ${SPOOL} sendq doneq docq tmp pollq archive + makeDirs: makeClientDirs makeServerDirs Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/comms/hylafax/patches/patch-configure,v retrieving revision 1.9 diff -u -p -r1.9 patch-configure --- patches/patch-configure 8 Jul 2010 16:21:17 -0000 1.9 +++ patches/patch-configure 22 Apr 2011 09:19:05 -0000 @@ -1,21 +1,75 @@ $OpenBSD: patch-configure,v 1.9 2010/07/08 16:21:17 giovanni Exp $ ---- configure.orig Fri Jul 3 21:36:32 2009 -+++ configure Tue Sep 22 19:57:45 2009 -@@ -69,7 +69,7 @@ DPS=no - GS=no - IMP=no - UTMP=auto --OPTIMIZER="-O" -+#OPTIMIZER="-O" - LIBTIFF="-L/usr/local/lib -ltiff" - TIFFINC=/usr/local/include +--- configure.orig Wed Sep 15 16:42:36 2010 ++++ configure Fri Apr 22 10:34:34 2011 +@@ -73,13 +73,13 @@ NLS=auto + OPTIMIZER="-O" + LIBCRYPT= + LIBPAM= +-LIBTIFF="-ltiff" +-TIFFINC= ++LIBTIFF="-L${LOCALBASE}/lib -ltiff" ++TIFFINC="-I${LOCALBASE}/include" TIFFBIN= -@@ -1533,7 +1533,7 @@ int t() { $f(); return 0; } + LIBUTIL= + LIBZ=-lz + ZLIBINC= +-LIBINTL= ++LIBINTL="-L${LOCALBASE}/lib -I${LOCALBASE}/include -lintl -liconv" + INTLINC= + REGEX=yes + LIBREGEX='-L${DEPTH}/regex -lregex' +@@ -1559,7 +1559,7 @@ int t() { $f(); return 0; } int main(){ t(); return 0; } EOF capture cat t.c - runMake t "t:; \${CCF} t.c $libs" -+ runMake t "t:; \${CCF} t.c -L%%LOCALBASE%%/lib $libs" ++ runMake t "t:; \${CCF} t.c -I${LOCALBASE}/include -L${LOCALBASE}/lib $libs" } # +@@ -1587,7 +1587,7 @@ CheckForIncludeFile() + echo "#include \"$i\"" + done)>t.c++ + capture cat t.c++ +- runMake t "t:; \${C++F} \${C++FILE} -E t.c++${MAKECXXOVERRIDE}" ++ runMake t "t:; \${C++F} \${C++FILE} -E t.c++${MAKECXXOVERRIDE} -I${LOCALBASE}/include" + } + + if [ "$SGI2FAX" = auto ]; then +@@ -3383,19 +3383,8 @@ fi + HAVE_JBIGTIFF="/*#define HAVE_JBIGTIFF 1*/" + if [ "$DISABLE_JBIG" != "yes" ]; then + Note "Checking JBIG-in-TIFF conversion support." +- $TIFFBIN/tiffcp -c g4 misc/jbig.tif misc/foo.tif > /dev/null 2>&1 +- if [ $? = 0 ]; then +- $TIFFBIN/tiffcp misc/jbig.tif misc/foo.tif > /dev/null +- if [ -n "`$TIFFBIN/tiffinfo misc/foo.tif | grep 'Fax DCS'`" ]; then +- HAVE_JBIGTIFF="#define HAVE_JBIGTIFF 1" +- Note "JBIG-in-TIFF conversion support found." +- else +- Note "JBIG-in-TIFF fax support not found." +- fi +- else +- Note "JBIG-in-TIFF conversion support not found." +- fi +- rm -f misc/foo.tif ++ # OpenBSD does not have JBIG-in-TIFF support ++ Note "JBIG-in-TIFF conversion support not found." + fi + + Note "Done checking TIFF support." +@@ -4659,10 +4648,10 @@ case $MANSCHEME in + *-0|*-0.gz|*-0.Z|*-gz|*-Z|*-z) + suf=`echo $MANSCHEME | $SED 's/.*-/./'` + A='`echo $$i | sed' B='`' # workaround shell bugs +- MANCAPPNAME="$A s/\\\\.1\$\$/$suf/$B" +- MANCFILENAME="$A s/\\\\.4f\$\$/$suf/$B" +- MANSAPPNAME="$A s/\\\\.1m\$\$/$suf/$B" +- MANSFILENAME="$A s/\\\\.4f\$\$/$suf/$B" ++ MANCAPPNAME="$A s/\\\\.1\$$/$suf/$B" ++ MANCFILENAME="$A s/\\\\.4f\$$/$suf/$B" ++ MANSAPPNAME="$A s/\\\\.1m\$$/$suf/$B" ++ MANSFILENAME="$A s/\\\\.4f\$$/$suf/$B" + ;; + bsd-*-strip) + MANCAPPNAME='$$i' Index: patches/patch-etc_faxsetup_sh_in =================================================================== RCS file: /cvs/ports/comms/hylafax/patches/patch-etc_faxsetup_sh_in,v retrieving revision 1.1 diff -u -p -r1.1 patch-etc_faxsetup_sh_in --- patches/patch-etc_faxsetup_sh_in 8 Feb 2008 23:10:45 -0000 1.1 +++ patches/patch-etc_faxsetup_sh_in 22 Apr 2011 09:19:05 -0000 @@ -1,6 +1,26 @@ $OpenBSD: patch-etc_faxsetup_sh_in,v 1.1 2008/02/08 23:10:45 okan Exp $ ---- etc/faxsetup.sh.in.orig Tue Nov 13 15:33:30 2007 -+++ etc/faxsetup.sh.in Sat Nov 24 23:27:24 2007 +--- etc/faxsetup.sh.in.orig Wed Sep 15 16:42:36 2010 ++++ etc/faxsetup.sh.in Wed Apr 20 15:12:06 2011 +@@ -45,7 +45,7 @@ PATH=/bin:/usr/bin:/etc + test -d /usr/ucb && PATH=$PATH:/usr/ucb # Sun and others + test -d /usr/bsd && PATH=$PATH:/usr/bsd # Silicon Graphics + test -d /usr/5bin && PATH=/usr/5bin:$PATH:/usr/etc # Sun and others +-test -d /usr/sbin && PATH=/usr/sbin:$PATH # 4.4BSD-derived ++test -d /sbin && PATH=/usr/sbin:$PATH # 4.4BSD-derived + test -d /usr/local/bin && PATH=$PATH:/usr/local/bin # for GNU tools + + AWK=@AWK@ # awk for use below +@@ -76,8 +76,8 @@ UUENCODE="@UUENCODE@" # uuencode command to dump in s + + FAX=@FAXUID@ # identity of the fax user + SERVICES=/etc/services # location of services database +-INETDCONF=/usr/etc/inetd.conf # default location of inetd configuration file +-ALIASES=/usr/lib/aliases # default location of mail aliases database file ++INETDCONF=/etc/inetd.conf # default location of inetd configuration file ++ALIASES=/etc/mail/aliases # default location of mail aliases database file + PASSWD=/etc/passwd # where to go for password entries + PROTOUID=@FAXUID@ # user who's uid we use for FAX user + defPROTOUID=3 # use this uid if PROTOUID doesn't exist @@ -2265,12 +2265,7 @@ if onServer; then findproc() Index: patches/patch-faxd_faxQueueApp_c++ =================================================================== RCS file: patches/patch-faxd_faxQueueApp_c++ diff -N patches/patch-faxd_faxQueueApp_c++ --- patches/patch-faxd_faxQueueApp_c++ 13 Jul 2010 15:19:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-faxd_faxQueueApp_c++,v 1.1 2010/07/13 15:19:10 naddy Exp $ ---- faxd/faxQueueApp.c++.orig Sun Jul 11 21:31:17 2010 -+++ faxd/faxQueueApp.c++ Sun Jul 11 21:31:42 2010 -@@ -1022,7 +1022,7 @@ faxQueueApp::preparePageChop(const FaxRequest& req, - if (dec.getLastBlanks() > minRows) - { - pagehandling.append(fxStr::format("Z%04x", -- fxmin((unsigned)0xFFFF, stripSize - (dec.getEndOfPage() - data)))); -+ fxmin((unsigned)0xFFFF, stripSize - (u_int)(dec.getEndOfPage() - data)))); - } - } - delete [] data; Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/comms/hylafax/pkg/PLIST,v retrieving revision 1.17 diff -u -p -r1.17 PLIST --- pkg/PLIST 15 Nov 2010 10:05:05 -0000 1.17 +++ pkg/PLIST 22 Apr 2011 09:19:05 -0000 @@ -90,7 +90,9 @@ libdata/hylafax/config/lucent-mt-10 libdata/hylafax/config/lucent-mt-2 libdata/hylafax/config/lucent-mt-20 libdata/hylafax/config/lucent-mt-21 +libdata/hylafax/config/mainpine-10 libdata/hylafax/config/mainpine-2 +libdata/hylafax/config/mainpine-20 libdata/hylafax/config/mainpine-21 libdata/hylafax/config/moto-288 libdata/hylafax/config/mt-1432 @@ -148,6 +150,7 @@ libdata/hylafax/etc/templates/de/notify- libdata/hylafax/etc/templates/de/notify-done.txt libdata/hylafax/etc/templates/de/notify-failed-page.txt libdata/hylafax/etc/templates/de/notify-failed.txt +libdata/hylafax/etc/templates/de/notify-faxmaster.txt libdata/hylafax/etc/templates/de/notify-format_failed.txt libdata/hylafax/etc/templates/de/notify-killed.txt libdata/hylafax/etc/templates/de/notify-no_formatter.txt @@ -169,6 +172,7 @@ libdata/hylafax/etc/templates/en/notify- libdata/hylafax/etc/templates/en/notify-done.txt libdata/hylafax/etc/templates/en/notify-failed-page.txt libdata/hylafax/etc/templates/en/notify-failed.txt +libdata/hylafax/etc/templates/en/notify-faxmaster.txt libdata/hylafax/etc/templates/en/notify-format_failed.txt libdata/hylafax/etc/templates/en/notify-killed.txt libdata/hylafax/etc/templates/en/notify-no_formatter.txt @@ -190,6 +194,7 @@ libdata/hylafax/etc/templates/es/notify- libdata/hylafax/etc/templates/es/notify-done.txt libdata/hylafax/etc/templates/es/notify-failed-page.txt libdata/hylafax/etc/templates/es/notify-failed.txt +libdata/hylafax/etc/templates/es/notify-faxmaster.txt libdata/hylafax/etc/templates/es/notify-format_failed.txt libdata/hylafax/etc/templates/es/notify-killed.txt libdata/hylafax/etc/templates/es/notify-no_formatter.txt @@ -211,6 +216,7 @@ libdata/hylafax/etc/templates/fr/notify- libdata/hylafax/etc/templates/fr/notify-done.txt libdata/hylafax/etc/templates/fr/notify-failed-page.txt libdata/hylafax/etc/templates/fr/notify-failed.txt +libdata/hylafax/etc/templates/fr/notify-faxmaster.txt libdata/hylafax/etc/templates/fr/notify-format_failed.txt libdata/hylafax/etc/templates/fr/notify-killed.txt libdata/hylafax/etc/templates/fr/notify-no_formatter.txt @@ -239,6 +245,7 @@ libdata/hylafax/etc/templates/html-sampl libdata/hylafax/etc/templates/html-sample1/notify-blocked.txt libdata/hylafax/etc/templates/html-sample1/notify-done.txt libdata/hylafax/etc/templates/html-sample1/notify-failed.txt +libdata/hylafax/etc/templates/html-sample1/notify-faxmaster.txt libdata/hylafax/etc/templates/html-sample1/notify-format_failed.txt libdata/hylafax/etc/templates/html-sample1/notify-killed.txt libdata/hylafax/etc/templates/html-sample1/notify-no_formatter.txt @@ -258,6 +265,7 @@ libdata/hylafax/etc/templates/it/notify- libdata/hylafax/etc/templates/it/notify-done.txt libdata/hylafax/etc/templates/it/notify-failed-page.txt libdata/hylafax/etc/templates/it/notify-failed.txt +libdata/hylafax/etc/templates/it/notify-faxmaster.txt libdata/hylafax/etc/templates/it/notify-format_failed.txt libdata/hylafax/etc/templates/it/notify-killed.txt libdata/hylafax/etc/templates/it/notify-no_formatter.txt @@ -279,6 +287,7 @@ libdata/hylafax/etc/templates/pl/notify- libdata/hylafax/etc/templates/pl/notify-done.txt libdata/hylafax/etc/templates/pl/notify-failed-page.txt libdata/hylafax/etc/templates/pl/notify-failed.txt +libdata/hylafax/etc/templates/pl/notify-faxmaster.txt libdata/hylafax/etc/templates/pl/notify-format_failed.txt libdata/hylafax/etc/templates/pl/notify-killed.txt libdata/hylafax/etc/templates/pl/notify-no_formatter.txt @@ -300,6 +309,7 @@ libdata/hylafax/etc/templates/pt/notify- libdata/hylafax/etc/templates/pt/notify-done.txt libdata/hylafax/etc/templates/pt/notify-failed-page.txt libdata/hylafax/etc/templates/pt/notify-failed.txt +libdata/hylafax/etc/templates/pt/notify-faxmaster.txt libdata/hylafax/etc/templates/pt/notify-format_failed.txt libdata/hylafax/etc/templates/pt/notify-killed.txt libdata/hylafax/etc/templates/pt/notify-no_formatter.txt @@ -321,6 +331,7 @@ libdata/hylafax/etc/templates/pt_BR/noti libdata/hylafax/etc/templates/pt_BR/notify-done.txt libdata/hylafax/etc/templates/pt_BR/notify-failed-page.txt libdata/hylafax/etc/templates/pt_BR/notify-failed.txt +libdata/hylafax/etc/templates/pt_BR/notify-faxmaster.txt libdata/hylafax/etc/templates/pt_BR/notify-format_failed.txt libdata/hylafax/etc/templates/pt_BR/notify-killed.txt libdata/hylafax/etc/templates/pt_BR/notify-no_formatter.txt @@ -342,6 +353,7 @@ libdata/hylafax/etc/templates/ro/notify- libdata/hylafax/etc/templates/ro/notify-done.txt libdata/hylafax/etc/templates/ro/notify-failed-page.txt libdata/hylafax/etc/templates/ro/notify-failed.txt +libdata/hylafax/etc/templates/ro/notify-faxmaster.txt libdata/hylafax/etc/templates/ro/notify-format_failed.txt libdata/hylafax/etc/templates/ro/notify-killed.txt libdata/hylafax/etc/templates/ro/notify-no_formatter.txt @@ -477,8 +489,10 @@ sbin/recvstats @bin sbin/tsitest @bin sbin/typetest sbin/xferfaxstats -share/doc/pkg-readmes/${FULLPKGNAME} @exec ln -sf %D/libdata/hylafax /var/spool/hylafax @exec mkfifo %D/libdata/hylafax/FIFO; chown uucp:dialer %D/libdata/hylafax/FIFO; chmod 600 %D/libdata/hylafax/FIFO @unexec rm %D/libdata/hylafax/FIFO @extraunexec rm -f /var/spool/hylafax +share/doc/pkg-readmes/${FULLPKGNAME} +@rcscript ${RCDIR}/hfaxd +@rcscript ${RCDIR}/faxq Index: pkg/README =================================================================== RCS file: /cvs/ports/comms/hylafax/pkg/README,v retrieving revision 1.4 diff -u -p -r1.4 README --- pkg/README 29 Nov 2010 22:33:11 -0000 1.4 +++ pkg/README 22 Apr 2011 09:19:05 -0000 @@ -15,13 +15,6 @@ Make sure that you have configured HylaF When you are asked to specify the name of tty device, use a tty device existing on your architecture instead of "ttyd1". -To start, add the following to /etc/rc.local: -if [ -x ${TRUEPREFIX}/sbin/faxq ]; then - ${TRUEPREFIX}/sbin/hfaxd -i hylafax - ${TRUEPREFIX}/sbin/faxq - echo -n ' hylafax' -fi - For accepting incoming FAX/data calls, modify /etc/ttys(5) to contain something like this: Index: pkg/faxq.rc =================================================================== RCS file: pkg/faxq.rc diff -N pkg/faxq.rc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/faxq.rc 22 Apr 2011 09:19:05 -0000 @@ -0,0 +1,11 @@ +#!/bin/sh +# +# $OpenBSD$ + +daemon="${TRUEPREFIX}/sbin/faxq" + +. /etc/rc.d/rc.subr + +rc_reload=NO + +rc_cmd $1 Index: pkg/hfaxd.rc =================================================================== RCS file: pkg/hfaxd.rc diff -N pkg/hfaxd.rc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/hfaxd.rc 22 Apr 2011 09:19:05 -0000 @@ -0,0 +1,12 @@ +#!/bin/sh +# +# $OpenBSD$ + +daemon="${TRUEPREFIX}/sbin/hfaxd" +daemon_flags="-l 0.0.0.0 -i hylafax -l ::0 -i hylafax" + +. /etc/rc.d/rc.subr + +rc_reload=NO + +rc_cmd $1
