Hello community,
here is the log from the commit of package hylafax
checked in at Fri Aug 3 00:32:45 CEST 2007.
--------
--- hylafax/hylafax.changes 2007-05-24 18:58:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/hylafax/hylafax.changes 2007-07-31 14:26:04.689801000 +0200
@@ -1,0 +2,75 @@
+Tue Jul 31 14:25:07 CEST 2007 - kkeil@suse.de
+
+- move capi4hylafax in a extra source package
+
+-------------------------------------------------------------------
+Tue Jul 31 13:42:44 CEST 2007 - kkeil@suse.de
+
+- update to version 4.4.0
+
+* Stop caching of DATE and VERSION by configure (Bug 854) (9 Mar 2007)
+* Adds T.32 Addendum 1 Extended DF formats (12 Mar 2007)
+* Unify and simply FCF tracing routines (12 Mar 2007)
+* Pad TCS/CSI string to avoid Class2 modem bugs (12 Mar 2007)
+* Increase the wait time for AT+FCLASS=? response (12 Mar 2007)
+* Fix error of forgotton fxgetty child under flawed ECM
+* Stop using CRP in Phase D in Class 1 sending (12 Mar 2007)
+* Add BadPageHandlingMethod feature defauting to RTN-SAVE (12 Mar 2007)
+* Don't wait Class1TrainingRecovery when CRP was received (12 Mar 2007)
+* Don't trigger hasV17Trouble for pages other than the first (12 Mar 2007)
+* Fix error of sending a block twice, empty the 2nd time (12 Mar 2007)
+* Replace Class1TrainingRecovery with Class1SwitchingCmd
+* Simplify Class1SwitchingCmd code and prevent duplication of the
+ command in session (12 Mar 2007)
+* Add Class1PageLengthSupport config option (12 Mar 2007)
+* Add Class1PageWidthSupport modem config option (12 Mar 2007)
+* Extend "awaiting ECM synchronization" timeout (12 Mar 2007)
+* Improve ECM HDLC frame decoder to recover more quickly from data corruption
+ and possibly find frames where it couldn't before (12 Mar 2007)
+* Improve response handling of AT+FRH=3 (12 Mar 2007)
+* Calculate PPM/PPS waiter instead of using T1
+* We can't rely on the timeout value to know if CONNECT has been seen
+ (12 Mar 2007)
+* Handle +FCERROR after most +FRH=3 commands (12 Mar 2007)
+* Restart Class 1 TCF reception timer after zeros start
+* Add more intelligence to the Class 1 receiver in sending RTN (12 Mar 2007)
+* Log correctly when a receiver DIS indicates no V.8 bit but
+ V.8 was already known to have succeeded (12 Mar 2007)
+* Handle MPS/EOP/EOM/CRP when expecting DCS, i.e. after RTN
+* Handle instances where ECM is negotiated but the sender
+ transmits non-ECM data and signalling (12 Mar 2007)
+* Bug 811: children should exit with _exit() (12 Mar 2007)
+* when dealing with JBIG/JPEG send PPR if we detect no frames
+ received but we're still missing the last frame (12 Mar 2007)
+* Logging instances where a sender transmits PPS again after our fourth PPR
+ signal (12 Mar 2007)
+* Add DTMF handling during call (12 Mar 2007)
+* Use DLE+DTX to help reseting when stuck in transmit (13 Mar 2007)
+* Recognize DTMF as caller id when waiting for rings (13 Mar 2007)
+* Force ECM when using V.8 (13 Mar 2007)
+* Prevent picking up again on the receiver's MCF signal when
+ re-entering Phase B in a batch (13 Mar 2007)
+* Don't fallback to V.17 speeds on TCF retransmisions (13 Mar 2007)
+* Improve sender-side RNR/RR flow control interaction (13 Mar 2007)
+* Flush modem input after NO CARRIER result in Class 1 Phase C send
+ (13 Mar 2007)
+* Fix send buffer when transmitting non-ECM data with a non-zero
+ scanline-time value (13 Mar 2007)
+* Restrict the usage of sending EOR, even when using MH and MR (13 Mar 2007)
+* Improve and extend JPEG parsing (13 Mar 2007)
+* Improve Class 1 handling when prologue frames fail after EOM (13 Mar 2007)
+* Compensate for 1728 pixel data when they DCS signalled differently
+ (13 Mar 2007)
+* Added the complete debian/ directory in order to create official
+ Debian packages (17 Mar 2007)
+* Email raw TIFF files with the correct MIME type of image/tiff (23 Mar 2007)
+* Accepts 'original' as equivalent to 'raw' for RETURNFILETYPE (23 Mar 2007)
+* faxq scheduler overhaul for efficiency and batching (May 4 2007)
+* Faxmail overhaul - make handle documents independantly, just like
+ sendfax (9 May 2007)
+* Change socklen_t configure/detection for HP-UX 11 (11 May 2007)
+* Add preliminary Class2 JBIG Support (11 May 2007)
+* Add JPEC (colour fax) to Class2 (12 May 2007)
+* Remove broken JobControlWait (23 July 2007)
+
+-------------------------------------------------------------------
Old:
----
capi4hylafax-01.03.00.tar.bz2
capi4hylafax-secfix2.diff
capi4hylafax-secfix.diff
capi4hylafax-suse.diff
hylafax-4.3.0-asciifix.dif
hylafax-4.3.0.dif
hylafax-4.3.0-dispatch-isdn.diff
hylafax-4.3.0-fax_user.dif
hylafax-4.3.0-isdn.dif
hylafax-4.3.0-pic.dif
hylafax-4.3.0.tar.bz2
hylafax-4.3.0-valist.dif
hylafax-4.3.0-warning.diff
New:
----
hylafax-4.4.0-asciifix.dif
hylafax-4.4.0.dif
hylafax-4.4.0-dispatch-isdn.diff
hylafax-4.4.0-fax_user.dif
hylafax-4.4.0-isdn.dif
hylafax-4.4.0-pic.dif
hylafax-4.4.0.tar.bz2
hylafax-4.4.0-valist.dif
hylafax-4.4.0-warning.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hylafax.spec ++++++
--- /var/tmp/diff_new_pack.j28767/_old 2007-08-03 00:30:01.000000000 +0200
+++ /var/tmp/diff_new_pack.j28767/_new 2007-08-03 00:30:01.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package hylafax (Version 4.3.0)
+# spec file for package hylafax (Version 4.4.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,19 +11,18 @@
# norootforbuild
Name: hylafax
-BuildRequires: capi4linux capi4linux-devel gcc-c++ ghostscript-library i4l-isdnlog libpng-devel libtiff-devel metamail mm postfix pwdutils
+BuildRequires: gcc-c++ ghostscript-library libpng-devel libtiff-devel metamail mm postfix pwdutils
License: X11/MIT
Group: Hardware/Fax
Provides: fax_daemon
Requires: tiff gs_lib smtp_daemon a2ps hylafax-client
Conflicts: sendfax
Autoreqprov: on
-Version: 4.3.0
-Release: 64
+Version: 4.4.0
+Release: 1
Source: %{name}-%{version}.tar.bz2
Source1: latex-cover-1.04.tar.bz2
Source2: %{name}-SuSE.tar.bz2
-Source3: capi4hylafax-01.03.00.tar.bz2
Patch: %{name}-%{version}.dif
Patch1: %{name}-%{version}-isdn.dif
Patch2: %{name}-%{version}-valist.dif
@@ -32,14 +31,10 @@
Patch5: %{name}-%{version}-asciifix.dif
Patch6: %{name}-%{version}-warning.diff
Patch7: %{name}-%{version}-dispatch-isdn.diff
-Patch10: capi4hylafax-suse.diff
-Patch11: capi4hylafax-secfix.diff
-Patch12: capi4hylafax-secfix2.diff
URL: http://www.hylafax.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Very Powerful Fax Server
PreReq: sh-utils fileutils %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/usermod
-%define server_root /srv/www
%description
Very powerful fax server.
@@ -68,27 +63,8 @@
--------
Sam Leffler
-%package -n capi4hylafax
-License: GNU General Public License (GPL)
-URL: http://www.avm.de
-Summary: Adds a faxcapi modem for hylafax
-Group: Hardware/Fax
-Autoreqprov: on
-PreReq: sh-utils fileutils %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/usermod
-
-%description -n capi4hylafax
-capi4hylafax adds a faxcapi modem to the hylafax environment. So you
-can send and receive FAX documents with CAPI 2.0 fax controllers via a
-hylafax server.
-
-
-
-Authors:
---------
- AVM
-
%prep
-%setup -q -n %{name}-%{version} -a 1 -a 2 -b 3
+%setup -q -n %{name}-%{version} -a 1 -a 2
%patch -p1
%patch1 -p1
%patch2 -p1
@@ -100,24 +76,12 @@
#-b .valist
# need to be executable
chmod 755 SuSE/usr/lib/fax/a2pswrap
-cd ../capi4hylafax-01.03.00
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
find ../ -name .cvsignore -exec rm {} \;
%build
%{?suse_update_config:%{suse_update_config -f}}
./configure --with-OPTIMIZER="$RPM_OPT_FLAGS" --with-STRIP=: \
${RPM_ARCH}-suse-linux < /dev/null
-make
-cd ../capi4hylafax-01.03.00
-CFLAGS=$RPM_OPT_FLAGS CXXFLAGS=$RPM_OPT_FLAGS \
-./configure --prefix=/usr \
- --with-hylafax-spooldir=/var/spool/fax \
- --with-hylafax-srcdir=/usr/src/packages/BUILD/%{name}-%{version}
-# --enable-debug
-make
%install
install -d ${RPM_BUILD_ROOT}/var/spool/fax
@@ -125,49 +89,23 @@
install -d ${RPM_BUILD_ROOT}/usr/%_lib
install -d ${RPM_BUILD_ROOT}/usr/share/man
install -d ${RPM_BUILD_ROOT}/etc/init.d
-install -d ${RPM_BUILD_ROOT}%{server_root}/htdocs/hylafax
-install -d ${RPM_BUILD_ROOT}%{server_root}/cgi-bin
-install -d ${RPM_BUILD_ROOT}%{_defaultdocdir}/hylafax
make install BIN=${RPM_BUILD_ROOT}/usr/bin LIBDATA=${RPM_BUILD_ROOT}/usr/lib/fax \
LIBEXEC=${RPM_BUILD_ROOT}/usr/lib/fax SBIN=${RPM_BUILD_ROOT}/usr/sbin \
SPOOL=${RPM_BUILD_ROOT}/var/spool/fax MAN=${RPM_BUILD_ROOT}/usr/share/man\
- DESTDIR=${RPM_BUILD_ROOT} HTMLDIR=${RPM_BUILD_ROOT}%{server_root}/htdocs/hylafax \
- CGIBIN=${RPM_BUILD_ROOT}%{server_root}/cgi-bin \
+ DESTDIR=${RPM_BUILD_ROOT} \
LIBDIR=${RPM_BUILD_ROOT}/usr/%_lib
install -m755 etc/hylafax ${RPM_BUILD_ROOT}/etc/init.d
ln -sf ../../etc/init.d/hylafax ${RPM_BUILD_ROOT}/usr/sbin/rchylafax
cp -af SuSE/* ${RPM_BUILD_ROOT}
rm -f ${RPM_BUILD_ROOT}/README.SuSE
install -m755 faxsend ${RPM_BUILD_ROOT}/var/spool/fax/bin/
-# capi4hylafax
-cd ../capi4hylafax-01.03.00
-make install BIN=${RPM_BUILD_ROOT}/usr/bin \
- SPOOL=${RPM_BUILD_ROOT}/var/spool/fax \
- LIBEXEC=${RPM_BUILD_ROOT}/usr/lib/fax \
- SBIN=${RPM_BUILD_ROOT}/usr/sbin \
- LIBDIR=${RPM_BUILD_ROOT}/usr/%_lib \
- DESTDIR=${RPM_BUILD_ROOT}
-install -m755 faxaddmodem.capi ${RPM_BUILD_ROOT}/usr/sbin/
-install -m755 setupconffile ${RPM_BUILD_ROOT}/usr/sbin/faxaddmodem.capi_dia
-cp -p config.faxCAPI ${RPM_BUILD_ROOT}/etc/config.faxCAPI.sample
-mkdir -p ${RPM_BUILD_ROOT}%{_defaultdocdir}/capi4hylafax
-cp -p AUTHORS LIESMICH.html README.html fritz_pic.tif COPYING Readme_src \
- LIESMICH.SuSE README.SuSE \
- ChangeLog sample_AVMC4_config.faxCAPI sample_faxrcvd \
- config.faxCAPI \
- ${RPM_BUILD_ROOT}%{_defaultdocdir}/capi4hylafax
+install -d ${RPM_BUILD_ROOT}%{_defaultdocdir}/hylafax
mv ${RPM_BUILD_ROOT}/usr/lib/fax/faxcover_example_sgi.ps ${RPM_BUILD_ROOT}%{_defaultdocdir}/hylafax
%pre
/usr/sbin/useradd -r -o -g uucp -u 33 -s /bin/bash -c "Facsimile agent" -d /var/spool/fax fax 2> /dev/null || :
/usr/sbin/usermod -g uucp -G dialout fax 2> /dev/null || :
-%pre -n capi4hylafax
-/usr/sbin/useradd -r -o -g uucp -u 33 -s /bin/bash -c "Facsimile agent" -d /var/spool/fax fax 2> /dev/null || :
-/usr/sbin/usermod -g uucp -G dialout fax 2> /dev/null || :
-test -f /var/spool/fax/etc/config.faxCAPI -a ! -f /etc/config.faxCAPI && \
- cp -a /var/spool/fax/etc/config.faxCAPI /etc/config.faxCAPI || :
-
%post
/bin/chown -f -R fax var/spool/fax/*
%{fillup_and_insserv hylafax}
@@ -186,41 +124,6 @@
%clean
[ "${RPM_BUILD_ROOT}" != "/" ] && [ -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT};
-%post -n capi4hylafax
-#!/bin/sh
-cd etc
-FILES=`grep -l "FaxReceiveUser:" config.fax*`
-test -z "$FILES" && exit
-CFG=""
-for f in $FILES ; do
- case $f in
- *~);;
- *orig);;
- *save);;
- *new);;
- *sample);;
- *) FRG=`grep "FaxReceiveGroup:" $f`
- if [ -z "$FRG" ]; then
- CFG="${CFG} $f"
- fi
- ;;
- esac
-done
-test -z "$CFG" && exit
-for f in $CFG ; do
- mv ${f} ${f}.orig
- cat ${f}.orig | while read line ; do
- case $line in
- FaxReceiveUser:*)
- echo "FaxReceiveUser: fax" >> ${f}
- echo "FaxReceiveGroup: dialout" >> ${f}
- ;;
- *) echo "$line" >> ${f}
- ;;
- esac
- done
-done
-
%files
%defattr(-, root, root)
%doc COPYRIGHT README SuSE/README.SuSE TODO VERSION latex-cover-1.04
@@ -235,10 +138,6 @@
/usr/lib/fax/lockname
/usr/lib/fax/ondelay
/usr/lib/fax/pagesend
-%{server_root}/cgi-bin/man2html
-%{server_root}/cgi-bin/manpage
-%{server_root}/cgi-bin/unquote
-%{server_root}/htdocs/hylafax/
%doc %{_mandir}/man5/hylafax-config.5f.gz
%doc %{_mandir}/man5/doneq.5f.gz
%doc %{_mandir}/man5/dialrules.5f.gz
@@ -344,6 +243,7 @@
%config(noreplace) /var/spool/fax/etc/lutRS18.pcf
%config(noreplace) /var/spool/fax/etc/xferfaxlog
%config(noreplace) /var/spool/fax/etc/users
+/var/spool/fax/etc/templates/
%dir /var/spool/fax/info
%dir /var/spool/fax/log
%dir /var/spool/fax/pollq
@@ -385,16 +285,75 @@
%doc %{_mandir}/man1/sgi2fax.1.gz
%doc %{_mandir}/man1/textfmt.1.gz
-%files -n capi4hylafax
-%defattr(-, root, root)
-%doc %{_defaultdocdir}/capi4hylafax
-/usr/bin/c2faxrecv
-/usr/bin/c2faxsend
-/usr/sbin/faxaddmodem.capi
-/usr/sbin/faxaddmodem.capi_dia
-/etc/config.faxCAPI.sample
-
%changelog
+* Tue Jul 31 2007 - kkeil@suse.de
+- move capi4hylafax in a extra source package
+* Tue Jul 31 2007 - kkeil@suse.de
+- update to version 4.4.0
+ * Stop caching of DATE and VERSION by configure (Bug 854) (9 Mar 2007)
+ * Adds T.32 Addendum 1 Extended DF formats (12 Mar 2007)
+ * Unify and simply FCF tracing routines (12 Mar 2007)
+ * Pad TCS/CSI string to avoid Class2 modem bugs (12 Mar 2007)
+ * Increase the wait time for AT+FCLASS=? response (12 Mar 2007)
+ * Fix error of forgotton fxgetty child under flawed ECM
+ * Stop using CRP in Phase D in Class 1 sending (12 Mar 2007)
+ * Add BadPageHandlingMethod feature defauting to RTN-SAVE (12 Mar 2007)
+ * Don't wait Class1TrainingRecovery when CRP was received (12 Mar 2007)
+ * Don't trigger hasV17Trouble for pages other than the first (12 Mar 2007)
+ * Fix error of sending a block twice, empty the 2nd time (12 Mar 2007)
+ * Replace Class1TrainingRecovery with Class1SwitchingCmd
+ * Simplify Class1SwitchingCmd code and prevent duplication of the
+ command in session (12 Mar 2007)
+ * Add Class1PageLengthSupport config option (12 Mar 2007)
+ * Add Class1PageWidthSupport modem config option (12 Mar 2007)
+ * Extend "awaiting ECM synchronization" timeout (12 Mar 2007)
+ * Improve ECM HDLC frame decoder to recover more quickly from data corruption
+ and possibly find frames where it couldn't before (12 Mar 2007)
+ * Improve response handling of AT+FRH=3 (12 Mar 2007)
+ * Calculate PPM/PPS waiter instead of using T1
+ * We can't rely on the timeout value to know if CONNECT has been seen
+ (12 Mar 2007)
+ * Handle +FCERROR after most +FRH=3 commands (12 Mar 2007)
+ * Restart Class 1 TCF reception timer after zeros start
+ * Add more intelligence to the Class 1 receiver in sending RTN (12 Mar 2007)
+ * Log correctly when a receiver DIS indicates no V.8 bit but
+ V.8 was already known to have succeeded (12 Mar 2007)
+ * Handle MPS/EOP/EOM/CRP when expecting DCS, i.e. after RTN
+ * Handle instances where ECM is negotiated but the sender
+ transmits non-ECM data and signalling (12 Mar 2007)
+ * Bug 811: children should exit with _exit() (12 Mar 2007)
+ * when dealing with JBIG/JPEG send PPR if we detect no frames
+ received but we're still missing the last frame (12 Mar 2007)
+ * Logging instances where a sender transmits PPS again after our fourth PPR
+ signal (12 Mar 2007)
+ * Add DTMF handling during call (12 Mar 2007)
+ * Use DLE+DTX to help reseting when stuck in transmit (13 Mar 2007)
+ * Recognize DTMF as caller id when waiting for rings (13 Mar 2007)
+ * Force ECM when using V.8 (13 Mar 2007)
+ * Prevent picking up again on the receiver's MCF signal when
+ re-entering Phase B in a batch (13 Mar 2007)
+ * Don't fallback to V.17 speeds on TCF retransmisions (13 Mar 2007)
+ * Improve sender-side RNR/RR flow control interaction (13 Mar 2007)
+ * Flush modem input after NO CARRIER result in Class 1 Phase C send
+ (13 Mar 2007)
+ * Fix send buffer when transmitting non-ECM data with a non-zero
+ scanline-time value (13 Mar 2007)
+ * Restrict the usage of sending EOR, even when using MH and MR (13 Mar 2007)
+ * Improve and extend JPEG parsing (13 Mar 2007)
+ * Improve Class 1 handling when prologue frames fail after EOM (13 Mar 2007)
+ * Compensate for 1728 pixel data when they DCS signalled differently
+ (13 Mar 2007)
+ * Added the complete debian/ directory in order to create official
+ Debian packages (17 Mar 2007)
+ * Email raw TIFF files with the correct MIME type of image/tiff (23 Mar 2007)
+ * Accepts 'original' as equivalent to 'raw' for RETURNFILETYPE (23 Mar 2007)
+ * faxq scheduler overhaul for efficiency and batching (May 4 2007)
+ * Faxmail overhaul - make handle documents independantly, just like
+ sendfax (9 May 2007)
+ * Change socklen_t configure/detection for HP-UX 11 (11 May 2007)
+ * Add preliminary Class2 JBIG Support (11 May 2007)
+ * Add JPEC (colour fax) to Class2 (12 May 2007)
+ * Remove broken JobControlWait (23 July 2007)
* Thu May 24 2007 - kkeil@suse.de
- cleanup spec file
* Thu May 24 2007 - ro@suse.de
++++++ hylafax-4.3.0-asciifix.dif -> hylafax-4.4.0-asciifix.dif ++++++
--- hylafax/hylafax-4.3.0-asciifix.dif 2005-12-19 16:23:35.000000000 +0100
+++ /mounts/work_src_done/STABLE/hylafax/hylafax-4.4.0-asciifix.dif 2007-07-31 13:36:34.130858000 +0200
@@ -1,8 +1,8 @@
-Index: hylafax-4.2.3/util/typerules
+Index: hylafax-4.4.0/util/typerules
===================================================================
---- hylafax-4.2.3.orig/util/typerules
-+++ hylafax-4.2.3/util/typerules
-@@ -155,8 +155,8 @@
+--- hylafax-4.4.0.orig/util/typerules
++++ hylafax-4.4.0/util/typerules
+@@ -154,8 +154,8 @@
#
# This causes anything else with ascii-only data to be treated as text.
#
@@ -13,7 +13,7 @@
#
# Use enscript, instead of HylaFAX textfmt, for converting text into ps.
-@@ -174,4 +174,5 @@
+@@ -173,4 +173,5 @@
# Support 7-bit text which would otherwise be seen as binary.
#
++++++ hylafax-4.3.0-asciifix.dif -> hylafax-4.4.0.dif ++++++
++++ 876 lines (skipped)
++++ between hylafax/hylafax-4.3.0-asciifix.dif
++++ and /mounts/work_src_done/STABLE/hylafax/hylafax-4.4.0.dif
++++++ hylafax-4.3.0-dispatch-isdn.diff -> hylafax-4.4.0-dispatch-isdn.diff ++++++
++++++ hylafax-4.3.0-fax_user.dif -> hylafax-4.4.0-fax_user.dif ++++++
--- hylafax/hylafax-4.3.0-fax_user.dif 2005-10-17 16:42:29.000000000 +0200
+++ /mounts/work_src_done/STABLE/hylafax/hylafax-4.4.0-fax_user.dif 2007-07-31 13:53:24.365613000 +0200
@@ -1,8 +1,8 @@
-Index: hylafax-4.2.1/config.site
+Index: hylafax-4.4.0/config.site
===================================================================
---- hylafax-4.2.1.orig/config.site
-+++ hylafax-4.2.1/config.site
-@@ -85,8 +85,8 @@ CGIPATH="/cgi-bin" # virtual path to C
+--- hylafax-4.4.0.orig/config.site
++++ hylafax-4.4.0/config.site
+@@ -71,9 +71,9 @@ DIR_LOCKS="/var/spool/locks" # director
#
#DEFVRES="196" # default vertical res for outbound fax
#FILLORDER="MS2LSB" # bit order of cpu (MSB2LSB/LSB2MSB)
@@ -10,14 +10,15 @@
-#FAXUID="uucp" # user ID for fax user
+FAXGID="uucp" # group ID for fax user
+FAXUID="fax" # user ID for fax user
- #PAGESIZE="ISO A4" # default page size
+ PAGESIZE="ISO A4" # default page size
#SYSGID="sys" # group ID for system installs
#SYSUID="bin" # user ID for system installs
-Index: hylafax-4.2.1/configure
+ #LOCKS="ascii" # default UUCP lockfile scheme
+Index: hylafax-4.4.0/configure
===================================================================
---- hylafax-4.2.1.orig/configure
-+++ hylafax-4.2.1/configure
-@@ -51,7 +51,7 @@ HTMLPATH=/hylafax
+--- hylafax-4.4.0.orig/configure
++++ hylafax-4.4.0/configure
+@@ -49,7 +49,7 @@ PATH_IMPRIP=/usr/lib/print/psrip
CGIPATH=/cgi-bin
DEFVRES=98
PAGESIZE="North American Letter"
@@ -26,11 +27,11 @@
FAXGID=
SYSUID=bin
SYSGID=
-Index: hylafax-4.2.1/etc/faxaddmodem.sh.in
+Index: hylafax-4.4.0/etc/faxaddmodem.sh.in
===================================================================
---- hylafax-4.2.1.orig/etc/faxaddmodem.sh.in
-+++ hylafax-4.2.1/etc/faxaddmodem.sh.in
-@@ -1784,7 +1784,7 @@ test -p $FIFO || {
+--- hylafax-4.4.0.orig/etc/faxaddmodem.sh.in
++++ hylafax-4.4.0/etc/faxaddmodem.sh.in
+@@ -1781,7 +1781,7 @@ test -p $FIFO || {
exit 1
fi
}
@@ -39,10 +40,10 @@
if [ "$OLDFIFO" ]; then
echo "Removing old fifo $OLDFIFO.";
$RMCMD $OLDFIFO;
-Index: hylafax-4.2.1/faxmail/mailfax.sh-postfix
+Index: hylafax-4.4.0/faxmail/mailfax.sh-postfix
===================================================================
---- hylafax-4.2.1.orig/faxmail/mailfax.sh-postfix
-+++ hylafax-4.2.1/faxmail/mailfax.sh-postfix
+--- hylafax-4.4.0.orig/faxmail/mailfax.sh-postfix
++++ hylafax-4.4.0/faxmail/mailfax.sh-postfix
@@ -97,7 +97,7 @@
# =====
#
@@ -52,22 +53,10 @@
# then replace
# flags= user=fax argv=/usr/bin/faxmail -d -n ${user}
# with
-Index: hylafax-4.2.1/html/troubleshooting.html.in
+Index: hylafax-4.4.0/pkg/postinstall.in
===================================================================
---- hylafax-4.2.1.orig/html/troubleshooting.html.in
-+++ hylafax-4.2.1/html/troubleshooting.html.in
-@@ -1180,7 +1180,6 @@ Other common problems involve the owners
- of the modem device file.
- When a HylaFAX server process is running it forces the tty
- device to be owned by the ``fax'' user
--(typically the same UID as the ``uucp'' user)
- and to have the mode specified by the
- <TT>DeviceMode</TT> configuration parameter.
- Finally, beware that there are several different styles of UUCP
-Index: hylafax-4.2.1/pkg/postinstall.in
-===================================================================
---- hylafax-4.2.1.orig/pkg/postinstall.in
-+++ hylafax-4.2.1/pkg/postinstall.in
+--- hylafax-4.4.0.orig/pkg/postinstall.in
++++ hylafax-4.4.0/pkg/postinstall.in
@@ -27,16 +27,16 @@ then
0 0 * * * @SBIN@/faxqclean
EOF
@@ -88,10 +77,10 @@
else
echo "\n\nRun @SBIN@/faxsetup -client\n"
-Index: hylafax-4.2.1/pkg/postremove.in
+Index: hylafax-4.4.0/pkg/postremove.in
===================================================================
---- hylafax-4.2.1.orig/pkg/postremove.in
-+++ hylafax-4.2.1/pkg/postremove.in
+--- hylafax-4.4.0.orig/pkg/postremove.in
++++ hylafax-4.4.0/pkg/postremove.in
@@ -13,7 +13,7 @@ then
# I'll automate this part when I get time
++++++ hylafax-4.3.0-isdn.dif -> hylafax-4.4.0-isdn.dif ++++++
--- hylafax/hylafax-4.3.0-isdn.dif 2006-08-02 18:35:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/hylafax/hylafax-4.4.0-isdn.dif 2007-07-31 13:29:55.897488000 +0200
@@ -1,7 +1,7 @@
-Index: hylafax-4.3.0/README.I4L
+Index: hylafax-4.4.0/README.I4L
===================================================================
--- /dev/null
-+++ hylafax-4.3.0/README.I4L
++++ hylafax-4.4.0/README.I4L
@@ -0,0 +1,10 @@
+
+This version contains sample config files for I4L Class1 and Class2
@@ -13,22 +13,22 @@
+To use this feature you simply add "<email> <number>" pairs to etc/users
+and use the "ATS23=3&L<numberlist>" I4L command in ModemResetCmd to listen
+on these numbes an transmit the number.
-Index: hylafax-4.3.0/config/Makefile.in
+Index: hylafax-4.4.0/config/Makefile.in
===================================================================
---- hylafax-4.3.0.orig/config/Makefile.in
-+++ hylafax-4.3.0/config/Makefile.in
-@@ -73,6 +73,7 @@ CONFIGFILES=class1 \
- hayes \
+--- hylafax-4.4.0.orig/config/Makefile.in
++++ hylafax-4.4.0/config/Makefile.in
+@@ -72,6 +72,7 @@ CONFIGFILES=class1 \
iaxmodem \
intel-400e \
+ ip568x \
+ linux-isdn-1 \
linux-isdn-2 \
lucent \
lucent-isa \
-Index: hylafax-4.3.0/config/topic
+Index: hylafax-4.4.0/config/topic
===================================================================
---- hylafax-4.3.0.orig/config/topic
-+++ hylafax-4.3.0/config/topic
+--- hylafax-4.4.0.orig/config/topic
++++ hylafax-4.4.0/config/topic
@@ -5,7 +5,6 @@
# CONFIG:CLASS1:TP560.*:.*:.*: Manufacturer=Topic Model=TP560
@@ -37,11 +37,11 @@
#
# BEGIN-SERVER
# END-SERVER
-Index: hylafax-4.3.0/etc/Makefile.in
+Index: hylafax-4.4.0/etc/Makefile.in
===================================================================
---- hylafax-4.3.0.orig/etc/Makefile.in
-+++ hylafax-4.3.0/etc/Makefile.in
-@@ -88,6 +88,7 @@ install: default
+--- hylafax-4.4.0.orig/etc/Makefile.in
++++ hylafax-4.4.0/etc/Makefile.in
+@@ -90,6 +90,7 @@ install: default
${PUTSERVER} -F ${SBIN} -m 755 -src probemodem.sh -O probemodem
${PUTSAMPLE} -F ${SPOOL}/etc -m 644 -o xferfaxlog
${PUTSAMPLE} -F ${SPOOL}/etc -m 600 -o hosts.hfaxd
@@ -49,10 +49,10 @@
for i in ${DIALRULES}; do \
${PUTSERVER} -F ${SPOOL}/etc -m 444 -src ${SRCDIR}/$$i \
-idb "config(update)" -O $$i; \
-Index: hylafax-4.3.0/etc/users
+Index: hylafax-4.4.0/etc/users
===================================================================
--- /dev/null
-+++ hylafax-4.3.0/etc/users
++++ hylafax-4.4.0/etc/users
@@ -0,0 +1,6 @@
+#
+# Sample users file for FaxDispatch on ISDN lines
@@ -60,11 +60,11 @@
+#
+user1@example.com 123
+user2@example.com 124
-Index: hylafax-4.3.0/faxd/ClassModem.c++
+Index: hylafax-4.4.0/faxd/ClassModem.c++
===================================================================
---- hylafax-4.3.0.orig/faxd/ClassModem.c++
-+++ hylafax-4.3.0/faxd/ClassModem.c++
-@@ -796,6 +796,9 @@ ClassModem::atResponse(char* buf, long m
+--- hylafax-4.4.0.orig/faxd/ClassModem.c++
++++ hylafax-4.4.0/faxd/ClassModem.c++
+@@ -839,6 +839,9 @@ ClassModem::atResponse(char* buf, long m
case 'R':
if (streq(buf, "RING")) // NB: avoid match of RINGING
lastResponse = AT_RING;
@@ -74,7 +74,7 @@
break;
case '\020':
if (streq(buf, "\020\003")) // DLE/ETX
-@@ -1316,6 +1319,12 @@ ClassModem::waitForRings(u_short rings,
+@@ -1372,6 +1375,12 @@ ClassModem::waitForRings(u_short rings,
if (conf.ringExtended.length() && strneq(rbuf, conf.ringExtended, conf.ringExtended.length())) // extended RING
gotring = true;
conf.parseCallID(rbuf, callid);
@@ -87,7 +87,7 @@
/* DID modems may send DID data in lieu of RING */
for (u_int i = 0; i < conf.idConfig.length(); i++) {
if (conf.idConfig[i].answerlength && callid.length(i) >= conf.idConfig[i].answerlength)
-@@ -1344,6 +1353,12 @@ ClassModem::waitForRings(u_short rings,
+@@ -1400,6 +1409,12 @@ ClassModem::waitForRings(u_short rings,
* with AT+VRID if we missed it before.
*/
conf.parseCallID(rbuf, callid);
@@ -100,10 +100,10 @@
}
} while (r != AT_OK && (Sys::now()-ringstart < 3));
for (u_int j = 0 ; j < conf.idConfig.length(); j++) {
-Index: hylafax-4.3.0/faxd/FaxServer.c++
+Index: hylafax-4.4.0/faxd/FaxServer.c++
===================================================================
---- hylafax-4.3.0.orig/faxd/FaxServer.c++
-+++ hylafax-4.3.0/faxd/FaxServer.c++
+--- hylafax-4.4.0.orig/faxd/FaxServer.c++
++++ hylafax-4.4.0/faxd/FaxServer.c++
@@ -250,6 +250,10 @@ void
FaxServer::readConfig(const fxStr& filename)
{
@@ -115,10 +115,10 @@
if (localIdentifier == "")
setLocalIdentifier(canonicalizePhoneNumber(FAXNumber));
}
-Index: hylafax-4.3.0/faxd/ServerConfig.c++
+Index: hylafax-4.4.0/faxd/ServerConfig.c++
===================================================================
---- hylafax-4.3.0.orig/faxd/ServerConfig.c++
-+++ hylafax-4.3.0/faxd/ServerConfig.c++
+--- hylafax-4.4.0.orig/faxd/ServerConfig.c++
++++ hylafax-4.4.0/faxd/ServerConfig.c++
@@ -84,6 +84,7 @@ ServerConfig::S_booltag ServerConfig::bo
ServerConfig::S_stringtag ServerConfig::strings[] = {
{ "logfacility", &ServerConfig::logFacility, LOG_FAX },
@@ -127,10 +127,10 @@
{ "areacode", &ServerConfig::areaCode },
{ "countrycode", &ServerConfig::countryCode },
{ "longdistanceprefix", &ServerConfig::longDistancePrefix },
-Index: hylafax-4.3.0/faxd/ServerConfig.h
+Index: hylafax-4.4.0/faxd/ServerConfig.h
===================================================================
---- hylafax-4.3.0.orig/faxd/ServerConfig.h
-+++ hylafax-4.3.0/faxd/ServerConfig.h
+--- hylafax-4.4.0.orig/faxd/ServerConfig.h
++++ hylafax-4.4.0/faxd/ServerConfig.h
@@ -123,6 +123,7 @@ public:
u_int maxConsecutiveBadCalls; // max consecutive bad phone calls
fxStr localIdentifier; // to use in place of FAXNumber
@@ -157,10 +157,10 @@
+inline const fxStr& ServerConfig::getcountryCode() const { return countryCode; }
+
#endif /* _ServerConfig_ */
-Index: hylafax-4.3.0/faxsend
+Index: hylafax-4.4.0/faxsend
===================================================================
--- /dev/null
-+++ hylafax-4.3.0/faxsend
++++ hylafax-4.4.0/faxsend
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
@@ -190,10 +190,10 @@
+done
+
+$SENDFAX $PARA
-Index: hylafax-4.3.0/util/FaxDispatch.sh
+Index: hylafax-4.4.0/util/FaxDispatch.sh
===================================================================
--- /dev/null
-+++ hylafax-4.3.0/util/FaxDispatch.sh
++++ hylafax-4.4.0/util/FaxDispatch.sh
@@ -0,0 +1,12 @@
+#
+# Dispatch fax to email depending on own MSN or extention (ISDN lines)
@@ -207,11 +207,11 @@
+ SENDTO="$USERNAME"
+ fi
+fi
-Index: hylafax-4.3.0/util/Makefile.in
+Index: hylafax-4.4.0/util/Makefile.in
===================================================================
---- hylafax-4.3.0.orig/util/Makefile.in
-+++ hylafax-4.3.0/util/Makefile.in
-@@ -190,6 +190,7 @@ install: installClient
+--- hylafax-4.4.0.orig/util/Makefile.in
++++ hylafax-4.4.0/util/Makefile.in
+@@ -194,6 +194,7 @@ install: installClient
${PUTSUPD} -m 755 -src common-functions.sh -O common-functions
${PUTSUPD} -m 755 -src dictionary.sh -O dictionary
${PUTSUPD} -m 755 -src faxrcvd.sh -O faxrcvd
@@ -219,11 +219,11 @@
${PUTSUPD} -m 755 -src pollrcvd.sh -O pollrcvd
${PUTSUPD} -m 755 -src mkcover.sh -O mkcover
${PUTSUPD} -m 755 -src wedged.sh -O wedged
-Index: hylafax-4.3.0/util/faxrcvd.sh.in
+Index: hylafax-4.4.0/util/faxrcvd.sh.in
===================================================================
---- hylafax-4.3.0.orig/util/faxrcvd.sh.in
-+++ hylafax-4.3.0/util/faxrcvd.sh.in
-@@ -122,8 +122,8 @@ SUBADDR="`$INFO $FILE | $AWK -F: '/SubAd
+--- hylafax-4.4.0.orig/util/faxrcvd.sh.in
++++ hylafax-4.4.0/util/faxrcvd.sh.in
+@@ -143,8 +143,8 @@ export TOADDR
# Apply customizations. All customizable variables should
# be set to their non-customized defaults prior to this.
#
@@ -233,11 +233,11 @@
+ . bin/FaxDispatch # NB: FaxDispatch sets SENDTO
fi
- #
-Index: hylafax-4.3.0/config/linux-isdn-1
+ if [ -f etc/templates/$TEMPLATE/hook.sh ]
+Index: hylafax-4.4.0/config/linux-isdn-1
===================================================================
--- /dev/null
-+++ hylafax-4.3.0/config/linux-isdn-1
++++ hylafax-4.4.0/config/linux-isdn-1
@@ -0,0 +1,38 @@
+#
+# prototype config file for Linux ISDN (/dev/ttyIX) Class1 modems
++++++ hylafax-4.3.0-pic.dif -> hylafax-4.4.0-pic.dif ++++++
++++++ hylafax-4.3.0.tar.bz2 -> hylafax-4.4.0.tar.bz2 ++++++
++++ 62231 lines of diff (skipped)
++++++ hylafax-4.3.0-valist.dif -> hylafax-4.4.0-valist.dif ++++++
--- hylafax/hylafax-4.3.0-valist.dif 2005-12-19 16:18:34.000000000 +0100
+++ /mounts/work_src_done/STABLE/hylafax/hylafax-4.4.0-valist.dif 2007-07-31 13:30:15.152221000 +0200
@@ -1,8 +1,8 @@
-Index: hylafax-4.2.3/util/FaxClient.c++
+Index: hylafax-4.4.0/util/FaxClient.c++
===================================================================
---- hylafax-4.2.3.orig/util/FaxClient.c++
-+++ hylafax-4.2.3/util/FaxClient.c++
-@@ -1288,6 +1288,7 @@ bool
+--- hylafax-4.4.0.orig/util/FaxClient.c++
++++ hylafax-4.4.0/util/FaxClient.c++
+@@ -1298,6 +1298,7 @@ bool
FaxClient::recvData(bool (*f)(int, const char*, int, fxStr&),
int arg, fxStr& emsg, u_long restart, const char* fmt, ...)
{
@@ -10,7 +10,7 @@
if ((!setMode(MODE_S)) ||
(!initDataConn(emsg)) ||
(restart && command("REST %lu", restart) != CONTINUE)) {
-@@ -1295,7 +1296,6 @@ FaxClient::recvData(bool (*f)(int, const
+@@ -1305,7 +1306,6 @@ FaxClient::recvData(bool (*f)(int, const
closeDataConn();
return (false);
}
@@ -18,7 +18,7 @@
va_start(ap, fmt);
int r; r = vcommand(fmt, ap);
va_end(ap);
-@@ -1338,6 +1338,7 @@ bool
+@@ -1348,6 +1348,7 @@ bool
FaxClient::recvZData(bool (*f)(void*, const char*, int, fxStr&),
void* arg, fxStr& emsg, u_long restart, const char* fmt, ...)
{
@@ -26,7 +26,7 @@
z_stream zstream;
zstream.zalloc = NULL;
zstream.zfree = NULL;
-@@ -1352,7 +1353,6 @@ FaxClient::recvZData(bool (*f)(void*, co
+@@ -1362,7 +1363,6 @@ FaxClient::recvZData(bool (*f)(void*, co
inflateEnd(&zstream);
return (false);
}
++++++ hylafax-4.3.0-warning.diff -> hylafax-4.4.0-warning.diff ++++++
--- hylafax/hylafax-4.3.0-warning.diff 2006-08-02 18:40:31.000000000 +0200
+++ /mounts/work_src_done/STABLE/hylafax/hylafax-4.4.0-warning.diff 2007-07-31 13:38:21.290589000 +0200
@@ -3,20 +3,8 @@
--- faxd/MemoryDecoder.c++.orig
+++ faxd/MemoryDecoder.c++
@@ -541,4 +541,5 @@ u_char* MemoryDecoder::convertDataFormat
+ printf("Attempt to convert Phase C data to an unsupported format. This should not happen.\n");
return (NULL);
- #endif /* HAVE_JBIG */
}
+ return NULL;
}
-Index: regex/engine.c
-===================================================================
---- regex/engine.c.orig
-+++ regex/engine.c
-@@ -679,6 +679,7 @@ sopno lev; /* PLUS nesting level */
- /* "can't happen" */
- assert(nope);
- /* NOTREACHED */
-+ return 0;
- }
-
- /*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org