[BACK]Return to patch-ae CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / comms / hylafax / patches

File: [cvs.NetBSD.org] / pkgsrc / comms / hylafax / patches / patch-ae (download)

Revision 1.10.8.1, Sun Jan 22 19:25:26 2006 UTC (16 years, 6 months ago) by salo
Branch: pkgsrc-2005Q4
Changes since 1.10: +31 -20 lines

Pullup ticket 1048 - requested by Adrian Portelli
security update for hylafax

Revisions pulled up:
- pkgsrc/comms/hylafax/Makefile			1.50
- pkgsrc/comms/hylafax/distinfo			1.17, 1.18
- pkgsrc/comms/hylafax/patches/patch-ae		1.11, 1.12

   Module Name:		pkgsrc
   Committed By:	wiz
   Date:		Wed Jan  4 22:36:50 UTC 2006

   Modified Files:
   	pkgsrc/comms/hylafax: distinfo
   	pkgsrc/comms/hylafax/patches: patch-ae

   Log Message:
   Accept tiff-3.8 (build fix).
---
   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Sun Jan 22 14:06:02 UTC 2006

   Modified Files:
   	pkgsrc/comms/hylafax: Makefile distinfo
   	pkgsrc/comms/hylafax/patches: patch-ae

   Log Message:
   Update to HylaFAX 4.2.5
   From the CHANGES:
   > Changelog for HylaFAX 4.2.5
   >
   > * change notify to not rely on echo -e (BUG 724) (11 Jan 2005)
   > * add prototype config catch for Digicom Leonardo modems (11 Jan 2005)
   > * make sure probemodem removes lock files (BUG 691) (9 Jan 2005)
   > * portability cleanup to MemoryDecoder.c++ (BUG 224) (9 Jan 2005)
   > * include crypt.h where necessary (BUG 722) (9 Jan 2005)
   > * fix eval sed in faxrcvd script (BUG 719) (9 Jan 2006)
   > * fix shell comments in nofity AWK script (BUG 719) (9 Jan 2006)
   >
   > Changelog for HylaFAX 4.2.4
   >
   > * CVE-2005-3539: Fix for faxrcvd/notify script vulnerabilites
   >   (4 Jan 2004)
   > * don't lock-down pagingProtocol by default (15 Dec 2005)
   > * CVE-2005-3538: fix possible hfaxd login vulnerability due
   >   to PAM library absence during build (15 Dec 2005)
   > * fix a Solaris compile error due to PAM_CONV_AGAIN (15 Dec 2005)
   > * fix Solaris 9 compile error due to PAM (15 Dec 2005)
   > * all Mainpine boards no longer identified as the DUO+
   >   2-port model (5 Dec 2005)
   > * update hfaxd 'site adduser' functionality (29 Nov 2005)
   > * prevent some faxgetty hangs in Phase C EOL sync (29 Nov 2005)
   > * fix for clients specifying TZONE LOCAL/GMT and using %Y for
   >   JobFmt and RcvFmt (22 Nov 2005)

$NetBSD: patch-ae,v 1.10.8.1 2006/01/22 19:25:26 salo Exp $

--- configure.orig	2005-12-16 22:40:30.000000000 +0000
+++ configure
@@ -37,23 +37,23 @@
 #
 # Setup general configuration parameters.
 #
-DIR_BIN=/usr/local/bin
-DIR_SBIN=/usr/local/sbin
-DIR_LIBDATA=/usr/local/lib/fax
-DIR_LIB=/usr/local/lib
-DIR_LIBEXEC=$DIR_SBIN
-DIR_SPOOL=/var/spool/hylafax
-DIR_HTML=/var/httpd/htdocs/hylafax
-DIR_CGI=/var/httpd/cgi-bin
+DIR_BIN=${PREFIX}/bin
+DIR_SBIN=${PREFIX}/sbin
+DIR_LIBDATA=${PREFIX}/libdata/hylafax
+DIR_LIB=${PREFIX}/lib
+DIR_LIBEXEC=${PREFIX}/libexec
+DIR_SPOOL=${VARBASE}/spool/hylafax
+DIR_HTML=${PREFIX}/http/htdocs/hylafax
+DIR_CGI=${PREFIX}/http/cgi-bin
 PATH_DPSRIP=$DIR_LIBEXEC/ps2fax.exe
-PATH_IMPRIP=/usr/lib/print/psrip
+PATH_IMPRIP=${PREFIX}/lib/print/psrip
 HTMLPATH=/hylafax
 CGIPATH=/cgi-bin
 DEFVRES=98
 PAGESIZE="North American Letter"
 FAXUID=uucp
 FAXGID=
-SYSUID=bin
+SYSUID=root
 SYSGID=
 DSO=auto
 GETTY=auto
@@ -72,9 +72,8 @@ DPS=no
 GS=no
 IMP=no
 UTMP=auto
-OPTIMIZER="-O"
-LIBTIFF="-L/usr/local/lib -ltiff"
-TIFFINC=/usr/local/include
+LIBTIFF="-Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltiff -ljpeg -lz -lm"
+TIFFINC=${PREFIX}/include
 TIFFBIN=
 LIBZ=
 ZLIBINC=
@@ -82,8 +81,8 @@ REGEX=yes
 LIBREGEX='-L${DEPTH}/regex -lregex'
 REGEXINC='${DEPTH}/${TOPSRCDIR}/regex'
 DBLIB=no
-LIBDB="-L/usr/local/lib -ldb"
-DBLIBINC=/usr/local/include
+LIBDB="-L${PREFIX}/lib -ldb"
+DBLIBINC=${PREFIX}/include
 FAXD=
 LIBFAXSERVER='libfaxserver.${DSO}'
 LIBUTIL='${UTIL}/libfaxutil.${DSO}'
@@ -224,6 +223,7 @@ PKG_EMAIL
 PKG_VENDOR
 PORT
 PORTFUNCS
+PREFIX
 PROTOTYPES
 PSPACKAGE	PS
 PWDCMD
@@ -290,7 +290,7 @@ test -d /usr/bsd && PATH=$PATH:/usr/bsd	
 test -d /usr/ucb && PATH=$PATH:/usr/ucb			# Sun and others
 test -d /usr/contrib/bin && PATH=$PATH:/usr/contrib/bin	# BSDi
 test -d /usr/5bin && PATH=/usr/5bin:$PATH:/usr/etc	# Sun and others
-test -d /usr/local/bin && PATH=/usr/local/bin:$PATH	# for GNU stuff
+test -d ${PREFIX}/bin && PATH=${PREFIX}/bin:$PATH	# for packages stuff
 PATH=$PATH:$OPATH
 
 POSIXLY_CORRECT=1; export POSIXLY_CORRECT		# disable GNU extensions
@@ -2418,7 +2418,7 @@ EOF
 	if [ ${header_ver} -ge 19960307 ]; then
 	    case ${lib_ver} in
 		3.4)		tiff_runlen_t="uint16" ;;
-		3.[567])	tiff_runlen_t="uint32" ;;
+		3.[5678])	tiff_runlen_t="uint32" ;;
 	    esac
 	fi
     else
@@ -3145,13 +3145,7 @@ main()
         printf("old include files: version %u\n", ZLIB_VERSION);
         exit(-1);
     }
-    if (strncmp(zlib_version, ZLIB_VERSION, 4) != 0) {
-        printf("library/header file incompatibility: %s %s\n",
-        zlib_version, ZLIB_VERSION);
-        exit(-1);
-    } else {
         exit(0);
-    }
 }
 EOF
 capture cat t.c
@@ -3213,7 +3207,7 @@ Note "Checking TIFF support."
 # Location of TIFF binaries
 #
 if [ -z "$TIFFBIN" ]; then
-    DIRS="/usr/local/bin /usr/contrib/bin /usr/gnu/bin /usr/bin"
+    DIRS="${PREFIX}/bin /usr/local/bin /usr/contrib/bin /usr/gnu/bin /usr/bin"
     for i in $DIRS; do
         test -x $i/tiff2ps && { TIFFBIN=$i; break; }
     done
@@ -3836,7 +3830,7 @@ fi
 if [ -z "$PATH_VGETTY" ]; then
     PATH_VGETTY=`findApp vgetty /usr/libexec:/sbin:$PATH` 
     if [ -z "$PATH_VGETTY" ]; then
-	PATH_VGETTY=/bin/vgetty
+	PATH_VGETTY=${PREFIX}/bin/vgetty
 	Note "WARNING, no vgetty program found to handle a voice call, using $PATH_VGETTY."
     else
 	Note "Looks like $PATH_VGETTY is the program to exec for a voice call."
@@ -3849,7 +3843,7 @@ fi
 if [ -z "$PATH_EGETTY" ]; then
     PATH_EGETTY=`findApp egetty /usr/libexec:/sbin:$PATH` 
     if [ -z "$PATH_EGETTY" ]; then
-	PATH_EGETTY=/bin/egetty
+	PATH_EGETTY=${PREFIX}/bin/egetty
 	Note "WARNING, no egetty program found, using $PATH_EGETTY."
     else
 	Note "Looks like $PATH_EGETTY is the program to exec for an extern call."
@@ -3920,6 +3914,7 @@ PickRIP()
 {
     if [ -z "$PATH_GSRIP" ]; then
 	GSLOCS="
+	    ${PREFIX}/bin/gs
 	    /usr/local/bin/gs
 	    /usr/contrib/bin/gs
 	    /usr/gnu/bin/gs
@@ -3967,7 +3962,7 @@ fax software to operate correctly.  See 
 on building Ghostscript with the necessary TIFF driver.
 
 EOF
-	PATH_PSRIP=/usr/local/bin/gs
+	PATH_PSRIP=${PREFIX}/bin/gs
 	PATH_GSRIP=$PATH_PSRIP
     fi
 }
@@ -4034,9 +4029,9 @@ if [ -z "$PATH_AFM" ]; then
     else
         DIR_AFMS="
 	    /usr/lib/afm
-	    /usr/local/lib/afm
-	    /usr/local/share/ghostscript/fonts
-	    /usr/local/lib/ghostscript/fonts
+	    ${PREFIX}/lib/afm
+	    ${PREFIX}/share/ghostscript/fonts
+ 	    ${PREFIX}/lib/ghostscript/fonts
 	    /usr/share/ghostscript/fonts
 	    /usr/gnu/lib/ghostscript/fonts
 	    /opt/gnu/lib/ghostscript/fonts
@@ -4056,7 +4051,7 @@ if [ -z "$PATH_AFM" ]; then
 fi
 if [ -z "$PATH_AFM" ]; then
     # put it where ghostscript normally puts things
-    PATH_AFM=/usr/local/lib/ghostscript/fonts
+    PATH_AFM=${PREFIX}/share/ghostscript/fonts
     Note "WARNING, could not locate a directory with font metric information,"
     Note "guessing that font metric information goes in $PATH_AFM."
 else
@@ -4075,7 +4070,7 @@ fi
 #
 if [ -z "$DIR_MAN" ]; then
     MANPATH="
-	$MANPATH
+	${PREFIX}/man
 	/usr/local/man
 	/usr/contrib/man
 	/usr/catman/local
@@ -4084,7 +4079,7 @@ if [ -z "$DIR_MAN" ]; then
     for i in $MANPATH; do
 	test -d $i && { DIR_MAN=$i; break; }
     done
-    test -z "$DIR_MAN" && DIR_MAN=/usr/local/man
+    test -z "$DIR_MAN" && DIR_MAN=${PREFIX}/man
 fi
 Note "Looks like manual pages go in $DIR_MAN."
 if [ -z "$MANSCHEME" ]; then