An obex application to transfer objects (address book items, images, movies,
anything the target can handle) to mobile devices via IrDA, Bluetooth and other
protocol via the OBEX format.
xtraeme: now it should be possible to transfer files from/to my cellular
phone from NetBSD.
For me this fixes the UTF-8 handling so that it works with the german PalmOS
version on the m515.
patch-0.99.8-memmory 11/11/05
Added a patch to fix a memory problem resulting in a segfault when modifying
records.
patch.jpilot-sync 11/05/05
Patch to fix unresolved symbol glob_tooltips when using jpilot-sync
0.99.8 - 11/30/05
This release is dedicated to my Mother who unexpectedly passed away
this last year.
Added translation for Kinyarwanda
Added panes to Expense and KeyRing
0.99.8-pre11 - 09/11/05
Added an install user from the menu.
Other miscellaneous fixes/changes
0.99.8-pre10 - 08/09/05 (Released by Ludovic Rousseau)
Solve a data corruption problem when used with pilot-link 0.12
Better support of 64-bit platforms
The last character was truncated using Hebrew encoding
Support localized date formats (for example Japanese)
jpilot-sync works again (no more jp_logf relocation error)
Some more bugs fixed
0.99.8-pre9 - 05/03/05 (Released by Ludovic Rousseau)
Cut-n-paste using X11 clipboard (mouse middle clic)
Return focus to the list after major operations which facilitates usability
Add hotkey (shift-return) to move focus between list and data window
In week and month views you can clic on a day to select it in the main view
Add remote sync. use "jpilot -s" to start a sync on the running jpilot
Add support of pilot-link 0.12.0-pre3
Some more bugs fixed
Updated translations: it, ja, fr
jpilot-dump.c: convert from UTF8 to local encoding
0.99.8-pre8 - 02/19/05 (Released by Ludovic Rousseau)
Cut-n-paste using GTK+ Ctrl-C/Ctrl-V now works across all four apps
Replace Sync and Backup text buttons by an color icon
Add Chinese BIG-5 Palm encoding
Update ja, zh_TW translations
GTK2 now uses CTRL+Enter consistently to apply changes
Add Cancel button with ESC accelerator
Added two preferences and code to
1) Mark current day in monthview and weekview guis by adding "TODAY"
to display
2) Display the absolute number of an event which repeats yearly
(usefulf or birthdays and anniversaries)
0.99.8-pre7 - 01/08/05 (Released by Ludovic Rousseau)
Update zh_CN, zh_TW, cs and es translations
Solve a crash in Japanese mode in address GUI
Extract the first day of week (sunday or monday) from the system locale setting
Add menu color icons for the 4 main applications
Improve todo sorting
Allow to cycle through the KeyRing categories by calling again the plugin
Some more bugs fixed
0.99.8-pre6 - 11/27/04 (Released by Ludovic Rousseau)
Solve the "different user ID sync" bug
Solve the GUI "freeze" bug
Some more bugs fixed
0.99.8-pre5 - 11/26/04 (Ludovic Rousseau)
Solve the "undefined symbol: jp_charset_j2p" error
Fix Japanese menu
Some code cleanup
0.99.8-pre4 - 11/24/04 (Released by Ludovic Rousseau)
Some more bugs fixed
Improved search sorting
Improved convertion to UTF-8 in case of errors
Use GBK instead of GB2312 charset encoding for Chinese
Use a radio item menu for Hide/Show/Mask records so that the state is
clearly indicated
Fix sort order for appts in datebook
Complete Japanese translation
0.99.8-pre3 - 11/14/04 (Released by Ludovic Rousseau)
Some more bugs fixed
The right-hand side of jpilot were not updated on a cursor movement.
Fixed unpredictable bug in repeating events caused by unitialized variable
Use iconv to convert from the Palm charset to UTF-8. Thanks to Amit Aronovitch
we now support many new charsets when used with GTK2:
- Hebrew (CP1255),
- Cyrillic (CP1251),
- Cyrillic (KOI8-R),
- Latin 2, Eastern Europe (ISO8859-2),
- Japanese (SJIS),
- Chinese (GB2312)
Complete Chinese translation. Thanks to lei Yu
The category selection was not working from the Export window for Addresses
Give a more explicit error message when pi_bind() fails. We now have
"permission denied" or "file not found" instead of "Illegal seek".
Also display the device name we are trying to use.
Thanks to Edgar Bonet for the patch
New preference to show or hide popup tooltips
Entries returned from datebook app during search were in random order
Get first day of week from locale in GTK2, no preference setting
0.99.8-pre2 - 10/20/04 (Released by Ludovic Rousseau)
some bugs fixed
add the same keyboards accelerators for the 4 applications:
Ctrl-D: Delete
Ctrl-O: Copy
Ctrl-N: New Record
Ctrl-R: Add Record
Ctrl-Return: Apply Changes
Ctrl-Y: Sync
KeyRing: can use non ASCII characters in name/account/password
nice GTK2 color icons in the menu
0.99.8-pre1 - 10/02/04 (Released by Ludovic Rousseau)
better UTF-8 handling (needed when using GTK2)
sort todo list by clicking on column title
lots of bugs fixed:
bug 1330: invalid postscript when printing the todo list contains ( or )
bug 1306: Keyring plugin truncates passwords
bug 1056: Undelete feature desired
bug 1338: Some repeating appointments do not show in monthview gui
bug 1176: Adding ability to e-mail directly from address book
bug 1182: Search screen needs a button
bug 1322: GTK2.4 libraries require changes to jpilotrc files to preserve colors
bug 1116: Word wrap provided when printing monthly calendar
bug 1154: resorting in address book should leave selection bar on same entry
bug 1107: show completed todos found through search regardless of show completed checkbox status
bug 1153: Patch reduces flicker when deleting records
bug 1131: ALT key for accelerator instead of control
bug 1184: truncating buffers with non ASCII charsets
Update Albanian translation (Besnik Bleta) and Catalan translation
Add Traditional Chinese translation (including efax-gtk.desktop)
Make the sort direction of the fax lists selectable
Improve time reporting to main window and to logfile
Have GobjHandle<> sink objects with floating references, and with
GTK+-2.9 and above use g_object_ref_sink() instead of
g_object_ref()/gtk_object_sink()
Have consistent keys shortcuts for the closing of dialogs
Use in_addr_t type explicitly where relevant
More...
Swedish translation added (Daniel Nylander).
Catalan translation added (Jordi Sayol Salomo).
Use gtk_widget_queue_draw() to update the drawing area which
indicates whether a fax is in the "faxes to send" queue via an
expose event rather than doing it directly.
Cater for serial port devices in sub-directories of /dev.
Have Notifier objects detect whether the signalling thread is the
same one as the thread in which the slot will execute and if so
by-pass the Notifier pipe, and implement Notifier objects without
using a map and object IDs.
Correctly handle case of constructor of SharedPtr and SharedHandle
objects throwing.
Allow the program to compile without X.
Document the use of G_IO_HUP with iowatches.
Correct comments about the use of PipeFifo::connect_to_stdout()
and PipeFifo::connect_to_stderr().
Improve text for translation about modem classes.
Include <ostream> and <istream> headers file where relevant.
Approved by maintainer.
Changes since last packaged version (8.1.11):
version 8.1.14 (Apr 9, 2006):
- fixed rpm conserver.spec file - based on patch by Martin Evans
<m.d.t.evans@qmul.ac.uk>
- added 'uds' console type for unix domain socket connections -
based on patch by DJ Gregor <dj@gregor.com>
- probing of interfaces under cygwin (and possibly others?) now
skips unconfigured interfaces (even if flagged as up!) -
reported by Chris Riddoch <chrisr@digeo.com>
- added the '!login' console option to prevent clients from
connecting to a console - suggested by Greg Tillman
<gregtillman@comcast.net>
- added a 'noop' console type for consoles you'd like to name,
but have no connection to - suggested by Greg Tillman
<gregtillman@comcast.net>
- deprecated escape commands removed from the code
- added '^EcP' and '^EcR' sequences to set the playback and
replay line lengths
- new console config options 'playback' and 'replay' to let the
client set prefered output lengths (with a special feature for
a size of zero)
- prefer strlcpy() over strcpy() - based on patch by Peter
Valchev <pvalchev@openbsd.org>
- fixed bug where '^Eco' by user on an 'exec' console with an
'initcmd' causes input by user to be ignored (could be other
console types as well) - reported by Mark Wedel
<Mark.Wedel@sun.com>
- made POSIX termios code in autologin a requirement (since
conserver requires it) and cleaned up a few other issues -
based on reports by Arthur Clune <ajc22@york.ac.uk>
version 8.1.13 (Jan 15, 2006):
- use SIOCGIFNUM for interface count (if available) and catch
EINVAL on Solaris - patch by Peter Jeremy
<peter.jeremy@alcatel.com.au>
- console output now resets idle timer - suggested by Peter
Saunders <pajs@fodder.org.uk>
- bug fix for conserver process running out of control and using
up cpu - debugged with Alexandra N. Kossovsky
<Alexandra.Kossovsky@oktetlabs.ru>
version 8.1.12 (Sep 5, 2005):
- printf() fix for autologin - patch by Menno Duursma
<druiloor@zonnet.nl>
- newly spawned (from SIGHUP) processes didn't properly close
primary socket
- SSL certificates now work again (anonymous ciphers are not
allowed if a certificate is used)
- client options -x, -u, -w, and -i can now take a console name
to restrict output - suggested by Evan McClure
<emcclure@internap.com>
- convert program now installed in $libdir/conserver - patch by
Petter Reinholdtsen <pere@hungry.com>
- we now ignore SIGXFSZ, if it exists
- added 'limited' access option to remove certain functionality
from users - suggested by Sven Michels <sven@darkman.de>
- added client option -z/-Z for sending commands to servers
(reload, quit, etc) - based on suggestion by Joshua Pincus
<Joshua.Pincus@Sun.COM>
- added 'execrunas' and 'initrunas' console options to allow
'exec' and 'initcmd' execution as another user and/or group -
based on patch by Gary Mills <mills@cc.umanitoba.ca>
- the east coast mirror had to shut down (for now, at least)
- crash from bad pointer manipulation during log replay - reported by
Ryan Kirkpatrick <linux@rkirkpat.net>
PKGLOCALEDIR and which install their locale files directly under
${PREFIX}/${PKGLOCALEDIR} and sort the PLIST file entries. From now
on, pkgsrc/mk/plist/plist-locale.awk will automatically handle
transforming the PLIST to refer to the correct locale directory.
* apps/app_page.c: oops... let's not set a variable and then
immediately overwrite it while assuming its old value will
magically return
* pbx.c: Bug 6957 - variable names beginning with CALLERID weren't
substituted correctly
RECOMMENDED is removed. It becomes ABI_DEPENDS.
BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo.
BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.
BUILDLINK_DEPENDS does not change.
IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS
which defaults to "yes".
Added to obsolete.mk checking for IGNORE_RECOMMENDED.
I did not manually go through and fix any aesthetic tab/spacing issues.
I have tested the above patch on DragonFly building and packaging
subversion and pkglint and their many dependencies.
I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I
have used IGNORE_RECOMMENDED for a long time). I have been an active user
of IGNORE_RECOMMENDED since it was available.
As suggested, I removed the documentation sentences suggesting bumping for
"security" issues.
As discussed on tech-pkg.
I will commit to revbump, pkglint, pkg_install, createbuildlink separately.
Note that if you use wip, it will fail! I will commit to pkgsrc-wip
later (within day).
appropriate OWN_DIRS_PERMS definition.
* Simplify the patches by overriding the value of CONFDIR at build time
and at installation time.
* Honor PKGINFODIR and PKGMANDIR.
Bump PKGREVISION to 4 due to INSTALL script changes.
INSTALL/DEINSTALL script creation within pkgsrc.
If an INSTALL or DEINSTALL script is found in the package directory,
it is automatically used as a template for the pkginstall-generated
scripts. If instead, they should be used simply as the full scripts,
then the package Makefile should set INSTALL_SRC or DEINSTALL_SRC
explicitly, e.g.:
INSTALL_SRC= ${PKGDIR}/INSTALL
DEINSTALL_SRC= # emtpy
As part of the restructuring of the pkginstall framework internals,
we now *always* generate temporary INSTALL or DEINSTALL scripts. By
comparing these temporary scripts with minimal INSTALL/DEINSTALL
scripts formed from only the base templates, we determine whether or
not the INSTALL/DEINSTALL scripts are actually needed by the package
(see the generate-install-scripts target in bsd.pkginstall.mk).
In addition, more variables in the framework have been made private.
The *_EXTRA_TMPL variables have been renamed to *_TEMPLATE, which are
more sensible names given the very few exported variables in this
framework. The only public variables relating to the templates are:
INSTALL_SRC INSTALL_TEMPLATE
DEINSTALL_SRC DEINSTALL_TEMPLATE
HEADER_TEMPLATE
The packages in pkgsrc have been modified to reflect the changes in
the pkginstall framework.
makeinfo if no native makeinfo executable exists. Honor TEXINFO_REQD
when determining whether the native makeinfo can be used.
* Remove USE_MAKEINFO and replace it with USE_TOOLS+=makeinfo.
* Get rid of all the "split" argument deduction for makeinfo since
the PLIST module already handles varying numbers of split info files
correctly.
NOTE: Platforms that have "makeinfo" in the base system should check
that the makeinfo entries of pkgsrc/mk/tools.${OPSYS}.mk are
correct.
developer is officially maintaining the package.
The rationale for changing this from "tech-pkg" to "pkgsrc-users" is
that it implies that any user can try to maintain the package (by
submitting patches to the mailing list). Since the folks most likely
to care about the package are the folks that want to use it or are
already using it, this would leverage the energy of users who aren't
developers.
0.9.0
adr2vcf: added (previously in flexmem), supports *45 and *55
apoconv: added, supports at least S55, M65, S65, CX75 and SL75
smi: added (previously smi2txt and smi2csv in flexmem)
scmxx: add bluez bluetooth support
scmxx: add windows bluetooth support (untested)
advanced status bar
Fix C++ RTL usage: c_str is how to get the representation, not getCStr.
Attempt to fix declaration of static template members. Be conditional
for GCC 3.4+ for now, it conflicts with the constructor in GCC 3.3.
Attempt to fix timezone usage as found in other packages.
Use PTHREAD_* variables instead of hard-coded -lpthread.
Don't look for _nl_domain_bindings in -lintl, libintl uses a different
prefix.
Remove harmfull class keywords in friend declarations.
* channels/chan_zap.c: disable buggy PRI user-user code until it
can be fixed
* channels/chan_sip.c: Issue 6182 - Don't remove scheduled event
until it's really done.
* channels/chan_sip.c: Issue 6362 - Register without Contact: and
Expires: fails
* ast_expr2.h, ast_expr2f.c, ast_expr2.c: Bug 6072 - Revisions to
the source bison and flex files don't auto-regenerate these files
* channels/chan_zap.c: fix problem with dtmf on e&m (issue #6364)
* channels/chan_sip.c: Issue 5898: Registrations does not get
deleted if there's an active SIP dialog
* channels/chan_sip.c: don't call ast_update_realtime with
uninitialized variables if we get a registration with an expirey
of 0 seconds (issue #6173)
* channels/chan_features.c: fix memory leak (inspired by issue
#6351)
- Replaced absolute directories like /usr/pkg and /var with ${PREFIX} and
${VARBASE}.
- USE_TOOLS+=perl:run, since there is one Perl program installed with the
package.
- Bumped PKGREVISION.
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)
Update Greek translation (Hellenic Linux Users Group).
Add German translation (po/de.po and mainwindow.cpp).
Destroy thread attribute object correctly (utils/thread.h and
utils/thread.cpp).
Use GtkSpinButton objects in the settings dialog where relevant
(settings.h, settings.cpp and settings_help.cpp).
Improve documentation/commenting of write_error() function
(mainwindow.cpp).
Update gettext tools to latest version (gettext-0.14.5)
(po/Makevars and po/Rules-quot).
Move typedef of InstanceMap into the Notifier class
(utils/notifier.h and utils/notifier.cpp).
Provide specific CFLAGS and CXXFLAGS specification in rpm spec
file (efax-gtk.spec.in and efax-gtk.spec).
new features, including support for DUNDi. (http://www.dundi.com/ for
more information)
The initial framework and porting of this package upgrade was done by
Martin J. Laubach, with lots of feature/PLIST fixes by me. DragonFly
support added by Joerg Sonnenberger.
the appropriate tool via USE_TOOLS (usually "gs:run"), and remove
ghostscript.mk. This change removes a rather out-dated file from
pkgsrc and switches packages to use the more compact implementation
of the Ghostcript-handling inside the tools framework.
0.8.2
complete rework of help output (adapt to width of terminal)
new progress bar implementation (used by phonebook code)
several bugs fixed:
* sms memory selection segfault
* phonebook deletion range bug
* time display issue
device blacklisting support, SF65 added to that list
Changelog for HylaFAX 4.2.2
* fix error of confirming an ECM block missing frames other
than the last frame when a null block is received (16 Sep 2005)
* fix error of tiffcheck missing needed reformatting (17 Aug 2005)
* add workaround for a bug in recent versions of gawk (15 Aug 2005)
* fix send error causing ECM data to not get sent (15 Aug 2005)
* homogenize default user id for user files (9 Aug 2005)
* remove deprecated cuserid (8 Aug 2005)
* fix some problems with sender notifications (5 Aug 2005)
* fix problem with PAM authentication features (2 Aug 2005)
* fix potential hang on reading data from modem (30 Jul 2005)
* fix potential hang on detecting an ECM block end (29 Jul 2005)
* fix job batches to properly release modems (26 Jul 2005)
* fix build error with Mac OS X 10.4 (26 Jul 2005)
* fix sendfax crash with verbose output (25, 29 Jul 2005)
* fix a race with scheduled jobs to allow for coordinated
batch sending (25 Jul, 10 Aug 2005)
* fix some error conditions with JBIG and JPEG reception (25 Jul 2005)
* improve probemodem results for some modems (16 Jul 2005)
* correct cover sheet page count for some PDFs (14 Jul 2005)
* fix job blocking (concurrent call) handling, especially
as dealing with batches (13 Jul 2003)
* fix job modifications on batched, running jobs (13 Jul 2005)
* throttle faxq from running the scheduler more than once per
second in order to keep faxq from eating up CPU (11, 21 Jul 2005)
* fix job preparation failures in batches from causing faxq list
corruption which would trigger faxq failure and worse (11 Jul 2005)
* fix the abortion of the lead job in a batch from causing
all other jobs in the batch to also abort (11, 15 Jul 2005)
* restrict MaxBatchJobs to 64 in order to prevent command-line
parameters from causing faxsend invocation errors (11 Jul 2005)
* fix ECM frame data from being overwritten by corrupt frames later
(11 Jul 2005)
* fix a faxq crash involving job alteration (4 Jul 2005)
* fix error of a pipe file descriptors not being closed (15 Jun 2005)
* fix error in not employing Class1SwitchingCmd before sending
prologue frames (15 Jun 2005)
* adjust configure for AIX 5 (14 Jun 2005)
* handle CRP sent as PPS (8 Jun 2005)
* fix segfault when resetting a received TIFF page (8 Jun 2005)
* update symbolic links to the Linux DSOs on upgrades (7 Jun 2005)
* extend PAM support to OpenPAM variants (6 Jun 2005)
* send PPR instead of DCN when an empty block is received (1 Jun 2005)
* fix some dysfunctional mail redirects (30 May 2005)
* don't save null-data pages (26 May, 6 Jun 2005)
* Add support for OpenServer 6 (24 May 2005)
* update config.guess and config.sub to current versions (24 May 2005)
* add Rockwell/Conexant Class 1.0 prototype config (18 May 2005)
* fix configure and faxsetup for espgs (16 May 2005)
* fix potential looping in Class 1 protocol flow control
mechanisms (11 May 2005)
* stop sendfax from passing comments to hfaxd due to
problems with newlines (10 May 2005)
* fix PAM authentication to set proper UID (9 May 2005)
* add unlimited length option to image preparation scripts
and add FaxModify customization support (9 May 2005)
* add UseJobTSI modem config option and FAXNUMBER and TSI
queue file options (9 May 2005)
* break NoCarrierRetries into JobRetry* parameters (9 May 2005)
* add JPEG color fax receiving support - requires
that libtiff and libjpeg be enhanced (6 May 2005)
* add PNG and JPEG to typerules (6 May 2005)
* add FaxModify hook for outbound image pre-processing (6 May 2005)
* improve the way that page transfer time, as stored in
the received TIFF file is calculated (6 May 2005)
* add option in lucent-mt-10 prototype config file to
work around a MainPine V.34-Fax problem (6 May 2005)
* add remoteNSF, remoteDIS to info files and return
CSI and interpreted NSF with notify information (4 May 2005)
* improved disconnection detection (25, 26 Apr 2005)
* wait longer for partial-page signals (19 Apr 2005)
* adjust the timing of input buffering enabling (15 Apr 2005)
* fix dialtest problem when using parenthesis (1 Apr 2005)
* fix crash when using malformed format strings (1 Apr 2005)
* initialize frameCount for compilers that don't (1 Apr 2005)
* add last-page CRP reception support in Phase D (30 Mar 2005)
* handle TSI, DCS, and other signals when in ECM (29 Mar 2005)
* don't transmit DCN after getting EOT (24 Mar 2005)
* improve the usage of T4 and T2 timers throughout (23 Mar 2005)
* improve some error-handling scenarios (23 Mar 2005)
* improve identification of ECM blocks with zero frames (16 Mar 2005)
* fix potential error in ECM reception frame counting (16 Mar 2005)
* add CRP usage when message frames are received
corrupt (14, 23 Mar 2005, 21 Jul 2005)
* add Class1RMPersistence, better ECM +FCERROR handling (14 Mar 2005)
* small fixes for compilation on AMD-64 (14 Mar 2005)
* fix a few timeouts in faxgetty (11 Mar 2005)
* add support for TIFFTAG_FAXDCS (5 Mar 2005)
* fix batching error in ECM to some receivers (5 Mar 2005)
* modify parsing of Class1EnableV34Cmd (5 Mar 2005)
* add configurable support for tiff2pdf from libtiff (2 Mar 2005)
* change the 2 s TCF timeout to use Class1TCFRecvTimeout (2 Mar 2005)
* handle PPS after 4th PPR (2 Mar 2005)
* fix potential error in counting of PPR signals (2 Mar 2005)
* handle EOT after PPS (28 Feb 2005)
* add Class1AdaptRecvCmd config option, AT+FAR=1 support, (28 Feb 2005)
* fix DCS scanline-time error when sending to systems without
ECM supporting "mixed" scanline-times (24 Feb 2005)
* cause faxsend to log jobs in batches as separate commids (24 Feb 2005)
* change how faxsend is invoked for batches (24 Feb 2005)
* minor fix in notify for mawk (16 Feb 2005)
* fix a false V.34-Fax error message after FTT (16 Feb 2005)
* convert CIDName/CIDNumber to CallID (14 Feb 2005)
* add MaxBatchJobs config option (10 Feb, 26 Aug 2005)
* improve the way that external gettys are run
* fix some problems when decoding pipe fails in ECM
* ignore "echos" of the dialed number after dialing
* set Class1*WaitCmds in cirrus config to not use +FTS/+FRS
* improve default modem config file for Digi/Patton Class 1
* force the Class 2 driver to repeat the +FDIS command after EOM
* add FaxParams class and some utilization of it
Additionally, unset DIST_SUBDIR again.
Add simplified Chinese translation
Provide internationalisation support for the efax program to which
efax-gtk is a front end
Make the fax top header line of a sent fax charset independent,
and remove some incorrect codeset conversions
Deal with two minor timing/race issues
Make Notifier::make_id() a static method, since it only uses local
or static objects
Instead of omitting the call to setlocale() in efax/efix.c, after
setting the locales to match their environment, reset LC_NUMERIC
to the "C" locale
Update Hungarian translation
SynCE is a project for connecting to devices running Windows CE or
Pocket PC. RRA implements the Remote Replication Agent Connection
protocol for synchronising objects between a Windows CE device and
another computer.
Synce-serial is part of the SynCE project.
This module contains helper scripts for setting up a serial connection
for use with SynCE. They are basically wrappers around pppd:
synce-serial-config - Use this to select serial port and IP adresses
synce-serial-start - Use this to start connection
synce-serial-abort - Use this to abort a connection
Librapi is part of the SynCE project.
The RAPI library is an open source implementation that works like
RAPI.DLL, available on Microsoft operating systems. The library
makes it possible to make remote calls to a computer running Pocket
PC.
In order to use librapi, a daemon that the Pocket PC client connects
to must be running on the computer using librapi.
Libsynce is part of the SynCE project.
The SynCE library is required to compile (at least) the following
parts of the SynCE project:
o librapi2
o dccmd
0.8.1
fixes some compilation and installation issues with *BSD (thanks to Mohacsi Janos)
fixes binary memory info output
automatically chooses the proper charset when sending short messages
make some more long options available as short options
mention all options in the help output and sort it alphabetically
mingw compile environment support (Windows)
Addition to 0.8.0 changelog:
reset now switches phone from transparent to RCCP mode (fixes debian bug #224965)
included german PO file update from debian BTS (fixes debian bug #313918)
Provide a further explicit cast to void* in sentinel for elipsis
arguments, for 64-bit systems
Provide for the automatic updating of the fax lists when a fax is
received or sent
Provide for the received fax list to show the number of new faxes
received since the program was last started
Make minor changes to handling of colours of certain labels
Make the program close properly if the "Quit" item is chosen from
the system tray menu and a blocking modal dialog is showing
Remove unnecessary use of GtkAlignment objects to adjust labels
-- fix bug in callerid matching in the dialplan that was introduced in 1.0.8
Changes 1.0.8:
-- chan_zap
-- Asterisk will now also look in the regular context for the fax extension
while executing a macro. Previously, for this to work, the fax extension
would have to be included in the macro definition.
-- On some systems, ALERTING will be sent after PROCEEDING, so code has been
added to account for this case.
-- If no extension is specified on an overlap call, the 's' extension will
be used.
-- chan_sip
-- We no longer send a "to" tag on "100 Trying" messages, as it is
inappropriate to do so.
-- We now respond correctly to an invite for T.38 with a "488 Not acceptable
here"
-- We now discard saved tags on 401/407 responses in case the provider we're
talking to tries to pull a dirty trick on us and change it.
-- rtptimeout options will now be correctly set on a peer basis rather than
only global
-- chan_mgcp
-- Fixed setting of accountcode
-- Fixed where *67 to block callerid only worked for first call
-- chan_agent
-- We now will not pass audio until the agent has acked the call if the
configuration
is set up for the agent to do so.
-- chan_alsa
-- Fixed problems with the unloading of this module
-- res_agi
-- A fix has been added to prevent calls from being hung up when more than
one call is executing an AGI script calling the GET DATA command.
-- AGI scripts will now continue to run even if a file was not found with
the GET DATA command.
-- When calling SAY NUMBER with a number like 09, we will now say "nine"
instead of "zero"
-- app_dial
-- There was a problem where text frames would not be forwarded before the
channel has been answered.
-- app_disa
-- Fixed the timeout used when no password is set
-- app_queue
-- Distinctive ring has been fixed to work for queue members
-- rtp
-- Fixed a logic error when setting the "rtpchecksums" option
-- say.c
-- A problem has been fixed with saying the date in Spanish.
-- Makefile
-- A line was missing for the autosupport script that caused "make rpm" to
fail
-- format_wav_gsm
-- Fixed a problem with wav formatting that prevented files from being
played in some media players
-- pbx_spool
-- Fixed if the last line of text in a file for the call spool did not
contain a new line, it would not be processed
-- logger
-- Fixed the logger so that color escape sequences wouldn't be sent to the
logs
-- format_sln
-- A lot of changes were made to correctly handle signed linear format on
big endian machines
backslashes anymore. A single backslash is enough. Changed the
definition in all affected packages. For those that are not caught, an
additional check is placed into bsd.pkginstall.mk.
as the INSTALL and DEINSTALL scripts no longer distinguish between
the two types of files. Drop SUPPORT_FILES{,_PERMS} and modify the
packages in pkgsrc accordingly.
Changes of note (security fixes were already integrated in an earlier
4.4.9nbX release):
* src/gate/ftn2rfc.c (unpack): if * Origin is empty, don't use it
for the Organization header, use default from config.
* src/common/log.c (logit): renamed old log() to avoid conflict
with Standard-C math function.
* src/common/log.c (log_program): removed insecure code entirely,
thanks to Niels Heinen for pointing this out.
* src/gate/send-fidogate.sh: added optimized version using rfc2ftn
-f for INN 2.4, thanks to Viktor Kafke.
Optimized versions for INN 2.2 und INN 2.4 enabled by
OPTIMIZED=yes at the start of this script, default = commented =
off.
* scripts/maintenance/logsendmail2.pl: new version of logsendmail
utility.
* src/gate/rfc2ftn.c (receiver): "sysop" is always a valid name.
* src/gate/rfc2ftn.c (main): new option "SilentBounces" causes
EX_NOHOST, EX_NOUSER errors to return OK without any message.
Useful in the never ending fight against spam, when your gateway
is flooded with messages to unknown adresses, such as Fido.DE :-(
(snd_mail): check silent_bounces, if set return OK and log only.
Add a date column to the fax lists, which derives the time of the
fax from the fax ID (the directory in which faxes are stored)
Provide for the fax ID (the directory in which faxes are stored)
for received faxes to be derived from the time that the fax is
received rather than the time that efax-gtk is put into receive
mode. This enables the fax lists to display the correct time of a
received fax.
Now that stored fax directories (fax name IDs) are not displayed
in the fax lists, provide the part of the ID representing a year
in 4 (or more) digit rather than 2 digit format (someone in 2099
might be pleased!).
Put a UTF-8 validation function in namespace Utf8.
Where relevant, handle PipeFifo and Notifier errors by exceptions
- consequential on putting the source for these in the utils
sub-directory.
Change clean-up arrangements on start-up.
Correct false calls to _exit() in FaxListDialog::view_fax_thread()
Make the PipeFifo and SemSync classes explicitly non-copiable
Provide further explicit casts to void* in sentinels for elipsis
arguments for 64-bit systems.
a) the four predefined break strings
b) the fact that \z is translated to the telnet "send break" protocol sequence
I've tried to send this patch upstream, but have yet to receive a response.
Bump package revision.
file's sole purpose was to provide a dependency on pkg-config and set
some environment variables. Instead, turn pkg-config into a "tool"
in the tools framework, where the pkg-config wrapper automatically
adds PKG_CONFIG_LIBDIR to the environment before invoking the real
pkg-config.
For all package Makefiles that included pkg-config/buildlink3.mk, remove
that inclusion and replace it with USE_TOOLS+=pkg-config.
For unknown reasons, data from AIR-EDGE PHONE often partially
get lost. This causes the program to hang, since it waits for
the lost data forever.
This update works around the problem implementing retry using tty
read timer.
The retry is implemented only for reading files from data folder.
Provide a settings option to omit the destination fax number from
the fax page top header line
Use a mutex to ensure that writes to the Notifier pipe are atomic
between threads
Some fixes for 64 bit systems:
Fixes for (harmless) warnings issued by gcc-4.0
around at either build-time or at run-time is:
USE_TOOLS+= perl # build-time
USE_TOOLS+= perl:run # run-time
Also remove some places where perl5/buildlink3.mk was being included
by a package Makefile, but all that the package wanted was the Perl
executable.
0.8.0
SMS code now support multipart message encoding on sending
use Docbook XML for man pages (with HTML output)
pin file (~/.scmxx/pin) support
new option: --lock
new option: --enable
new option: --disable
new option: --hangup
--dial now waits until the phone connected to the remote side
fixes for all gcc4 warnings
fixes for starting connection with reset now being inline if requested
fixes for file upload (not obex!) to S55 (now marked as supported)
add binary slot number filter (fixes debian bug #145570) for *45 and S55
Too many Changes to list here (Changelog is too long), so only whats new in 2.1:
- applied some pending patches (see ChangeLog for a complete list)
- added support for socket connections
- fixed compiling issues on Solaris
- new maintainer: Adam Lackorzynski
- new homepage: http://minicom.alioth.debian.org/
- new mailinglists (-devel and -announce):
http://alioth.debian.org/mail/?group_id=31
NetBSD patches:
- Include <sys/types.h> to fix PR pkg/29026 (1st error)
- Fix i18n error for PR pkg/29939, which should also fix PR pkg29026 (2nd error)
- Remove the create-dev-link script, which fix PR pkg/29026 (3rd error)
The system administrator is expected to setup the correct configuration
of the modem device.
- Updated patches and removed patch-af and patch-ag
- Fix the path for the lrzsz and gkermit tools in the default configuration
- Remove the old share/doc/minicom dir, because the new Makefiles doesn't
install them and they are outdated
Version 8 of Conserver as a separate package as the config file
format of version 8 is incompatible with prior versions.
Conserver is an application that allows multiple users to watch a
serial console at the same time. It can log the data, allows users
to take write-access of a console (one at a time), and has a variety
of bells and whistles to accentuate that basic functionality.
The idea is that conserver will log all your serial traffic so you
can go back and review why something crashed, look at changes (if
done on the console), or tie the console logs into a monitoring
system (just watch the logfiles it creates).
With multi-user capabilities you can work on equipment with others,
mentor, train, etc.
It also does all that client-server stuff so that, assuming you
have a network connection, you can interact with any of the equipment
from home or wherever
Several changes are involved since they are all interrelated. These
changes affect about 1000 files.
The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk. bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files. Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred. This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.
The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages. Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc. This modification is a nod toward LOCALBASE=/usr. The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.
The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc. The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.
The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files. Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories. These files are used as input
to imake since imake can't use stdin for that purpose.
The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead. This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed. Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries. Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.
- fixed delete_sms() command syntax and results parsing. Thanks
to all users that reported problems.
- added an example script on how to delete sms messages.
And always is defined as share/examples/rc.d
which was the default before.
This rc.d scripts are not automatically added to PLISTs now also.
So add to each corresponding PLIST as required.
This was discussed on tech-pkg in late January and late April.
Todo: remove the RCD_SCRIPTS_EXAMPLEDIR uses in MESSAGES and elsewhere
and remove the RCD_SCRIPTS_EXAMPLEDIR itself.
There are still some features not enabled by default, but this is a
solid foundation upon which to build - a fully-functional PBX can be
built, including PSTN gatewaying using the comms/zaptel-netbsd package.
From the DESCR:
Asterisk is a complete PBX in software. It provides
all of the features you would expect from a PBX and more. Asterisk
does voice over IP in three protocols, and can interoperate with
almost all standards-based telephony equipment using relatively
inexpensive hardware.
Asterisk provides Voicemail services with Directory, Call Conferencing,
Interactive Voice Response, Call Queuing. It has support for
three-way calling, caller ID services, ADSI, SIP and H.323 (as both
client and gateway).
This package provides the "zaptel" drivers, which support the Asterisk
software PBX, ported to NetBSD.
These are some drivers and auxiliary tools for NetBSD in support of
the Asterisk PBX. The wcfxo driver supports the Wildcard X100P/X101P and
clones, the wcfxs driver supports the Wildcard TDM400p, and the ztdummy
driver provides a software-only timer device which makes conferencing
work much better. (That is, if you run Asterisk, you may want these
drivers even if you don't have any of the hardware)
The T1 board driver has not yet been ported.
Fix bug where the Trash folder is dragged in the fax lists
(fax_list_manager.cpp).
Greek translation added (the Hellenic Linux Users Group
translation team).
Italian translation updated (Luca De Rugeriis).
Adjust image sizes for toolbar buttons in GTK+2.4 or higher
(fax_list.cpp, file_list.cpp and socket_list.cpp).
Provision to ensure synchronisation of memory where necessary in
multi-processor systems (efax_controller.h and
efax_controller.cpp).
config file, which we were skipping.
Changes from mgetty+sendfax-1.1.30:
Sat Jul 24 16:54:52 MEST 2004 Gert Doering <gert@greenie.muc.de>
* release 1.1.31
* doc/mgetty.texi-in: add section on isdn4linux and CAPI
Sat Jul 17 17:21:38 MEST 2004 Gert Doering <gert@greenie.muc.de>
* doc/sff2g3.1in: add man page for sff2g3
Sat Jul 17 12:18:28 MEST 2004 Andreas Barth <aba@not.so.argh.org>
* cnd.c: add "+CLIP:" string for caller ID
* voice/libvoice/detect.c: ATI codes for Zoom and Multitech modems
* voice/libvoice/V253modem.c: more flexible sample/s. handling
(old stuff was fixed at 7200 hz)
* voice/pvftools/pvftormd.c: accept 7200, 8000, 11025 Hz for "Lucent"
* fax/faxspool.in: use per-user .faxheader/.make.coverpg files
instead of global defaults (if per-user files exists)
Fri Jul 16 19:03:48 MEST 2004 Gert Doering <gert@greenie.muc.de>
* g3/Makefile: add "make test" test suite (for G3 tools)
* g3/sff2g3.c: NEW: converter from CAPI SFF fax format to raw G3
* Makefile: pack g3/sff2g3.c
Thu Feb 5 18:40:29 MET 2004 Gert Doering <gert@greenie.muc.de>
* fax/faxspool: rework umask saving/restoring (use subshell trick)
Sat Jan 10 00:01:25 MET 2004 Gert Doering <gert@greenie.muc.de>
* faxlib.c: add 1503 ID code (ZyXEL U-90E)
Tue Dec 16 12:46:52 MET 2003 Andreas Barth <aba+nospam@not.so.argh.org>
* Makefile: remove -DAUTO_PPP
* policy.h: include FIDO and AUTO_PPP here
Fri Dec 5 22:46:47 MET 2003 Ken Findlay <kjf@taylorbritt.com>
* login.c: empty lines should never match, not even empty user names
Mon Nov 17 20:08:59 MET 2003 Gert Doering
* mgetty.c: log warning if parent PID is not "1" (init)
* mgetty.cfg.in: add clarification about "direct yes" to sample cfg
Fri Nov 7 21:47:27 MET 2003 Andreas Barth <aba+nospam@not.so.argh.org>
* fax/faxspool.in: add per-user faxheader and coverpg files
* doc/faxspool.1in, mgetty.texi: document new feature
Thu Oct 9 12:44:47 MEST 2003 Gert Doering
* fax/faxspool.in: reject empty (0 bytes) input files
Sun Oct 5 13:59:51 MEST 2003 Gert Doering
* do_chat.c: make clean_line() logging show the timeout value
Mon Sep 29 23:36:34 MEST 2003 Andreas Barth
* contrib/g3tolj.c, g3toxwd.c: clean up protoypes and return types
* various .c files: integrate Debian cleanup fixes (usually
adding <string.h> and/or <stdlib.h> where missing)
Wed Aug 20 12:39:53 MEST 2003 Gert Doering (gert@greenie.muc.de)
* fax/faxrunqd.in: change signal handling - use HUP for graceful
exit, and dump statistics to logfile upon receipt of USR2
Sat Jun 28 22:14:35 MEST 2003 Gert Doering (gert@greenie.muc.de)
* fax/faxq-helper.c: honour user umask when spooling G3 files
(user decides whether group/other can read faxes)
* fax/faxspoool.in: reset umask after creating tmpdir (with umask 077)
* fax/faxq-helper.c: file name validation was overly strict -
accept anything that's printable, not a space, '/' or '\'
Thu Jun 12 16:56:44 MEST 2003 Gert Doering (gert@greenie.muc.de)
* faxlib.c: Multitech and USR return class 2.0/2.1 +FPS:<x>,<lc>
values in decimal, not hex -> change +FPS: parser to do decimal
for those modems (via modem_quirks |= MQ_FPS_NOT_HEX)
* fax_lib.h: add MQ_FPS_NOT_HEX modem quirk bit
* faxrec.c, faxrecp.c: understand VR=8 for "normal mode" (200x100 dpi)
Mon Apr 28 19:41:14 MEST 2003 Gert Doering (gert@greenie.muc.de)
* logname: make "buffer overrun" error message more precise
Wed Apr 23 10:49:25 MEST 2003 John R. Jackson <jrj@purdue.edu>
* voice/libutil/access.c: more verbose error reporting
Wed Apr 9 23:05:23 MEST 2003 Gert Doering (gert@greenie.muc.de)
* fax/faxspool.in: fix spooling without header line (-h -)
Sun Apr 6 16:09:14 MEST 2003 Andreas Barth <aba@not.so.argh.org>
* mgetty.8in, mgetty.texi-in: document escape sequences for
/etc/issue and login prompt.
Wed Mar 5 21:37:38 MET 2003 Gert Doering (gert@greenie.muc.de)
* Makefile: abort "make install" before installing faxspool
if fax user does not exist
* Makefile: unconditionally chown $FAX_SPOOL_OUT to fax user
Tue Feb 4 17:46:45 MET 2003 Gert Doering (gert@greenie.muc.de)
* fax/faxq-helper.c: uid=0 overrides access permission checks
* fax/faxrm.in: bugfix: get faxq-helper path from sedscript
Tue Jan 21 14:27:39 MET 2003 Gert Doering (gert@greenie.muc.de)
* fax/faxspool.in: abort with a proper error message on input file
names containing white space or quote characters
Tue Jan 14 14:30:42 MET 2003 Gert Doering (gert@greenie.muc.de)
* fax/faxrunqd.in: include "success" counter in per_phone_statistics
* ugly.h: #define USE_VARARGS for non-Ansi C compilers
* logfile.c: change #include<> sequence to catch USE_VARARGS def.
Wed Jan 8 23:03:26 MET 2003 Gert Doering (gert@greenie.muc.de)
* fax/faxrunqd.in: if a fax job fails, reschedule on different
modem (if possible)
* voice/libvoice/V253modem.c: fix ELSA_RMD_NAME (used for
V.253 modem <-> other modem RMD equivalency checks)
fix: transparent pin processing was broken
fix: direct sms receive mode was broken
extended direct sms receive mode to also get status report messages
support for finding empty phonebook slot
add support for OS/2 (thanks to Alex Samorukov)
new special string "last" for phonebooks
enabled direct receiving of short message status reports
new option --system-charset
italian translation for rpm spec file, manpage and gettext messages
(thanks to Andrea Benazzo)
* fix CAN-2004-1182: hfaxd client/server authentication
vulnerability (10 Jan 2005)
* fix possible filename race in tiff2pdf (10 Jan 2005)
* improve modern distinctive ring support, add
NoAnswerVoice config feature, and enhance third-party
getty interaction (1, 2 Jan 2005)
* add support for etc/resetmodem (30 Dec 2004)
* fix NOTIFY_FAXMASTER within notify (30 Dec 2004)
* improve tiff2pdf and use it more (29 Dec 2004)
* fix 300 dpi support for some receivers (28 Dec 2004)
* cause faxsetup to double-check and fix attachment encoding
setup (27 Dec 2004)
* add uuencode support in pollrcvd (27 Dec 2004)
* add support for base64-encode (27 Dec 2004)
* check strftime with arguments, gcc-3.3 fix (23 Dec 2004)
* initialize some variables in some scripts that may not
be initialzed in setup.cache (23, 27 Dec 2004)
* remove need to have separate "fax" user (22 Dec 2004)
* fix parsing of AT+FCLASS=? response within faxaddmodem
and probemodem (21 Dec 2004)
* improve multi-line handling within notify (20 Dec 2004)
* improve trap handling in faxaddmodem/probemodem (17 Dec 2004)
* fix hfaxd from rejecting jobs scheduled for the past while
the killtime is still in the future (15 Dec 2004)
* drop ftp links from received notification e-mail (8 Dec 2004)
* fix dial-and-answer feature (2 Dec 2004)
* add NSF recognition for MFC-3100C (29 Nov 2004)
* fix Class 1 support for services "0,1.0" (26 Nov 2004)
* limit hfaxd jobs cache size (23 Nov 2004)
* fix hfaxd ABOR command and trigger (23 Nov 2004)
* fix error when hfaxd FIFO fills (23 Nov 2004)
* document -age option for recvstats/xferfaxstats (23 Nov 2004)
* add coversheet information into the q-file (23 Nov 2004)
* fix documentation regarding DesiredEC (23 Nov 2004)
* change minsp to minbr for consistency (23 Nov, 2 Dec 2004)
* fix hfaxd problem with file descriptors (23 Nov 2004)
* fix hfaxd from dying on ECONNABORTED (23 Nov 2004)
* add -fpic to DSO build for non-x86 Linux (23 Nov 2004)
* add CALL records to xferfaxlog and LogCalls config (16 Nov 2004)
* fix/implement desireddf in faxsend and faxq (29 Oct 2004)
* fix the filetype output for JPARM DOCUMENTS (14 Oct 2004)
* add SHIELDED_DTMF option for CIDNumber (7 Oct 2004)
* add Class1Resolutions, deprecate Class1ExtendedRes (20 Sep 2004)
* fix a bug in notify when the job is killed (15 Sep 2004)
* initialize supplementary groups when switching
uid (13 Sep, 8 Dec 2004)
* fix faxsend to retrain after receiving RTP (9 Sep 2004)
* fix tiffcheck unit comparison error (1 Sep 2004)
* fix misconfirmation of some ECM faxes (30 Aug 2004)
* add fax batching support to faxq (30 Aug, 9 Sep 2004)
* ignore garbage after sending TCF data (26 Aug 2004)
* fix truncation of filenames in faxcron (26 Aug 2004)
* add configure support for libtiff 3.7 (25 Aug 2004)
* extend short send-HDLC timeouts (18 Aug 2004)
* add a pause after receiving MCF on non-ECM send sessions (18 Aug 2004)
* fix broken fax polling (17 Aug 2004)
* add several timing enhancements for stressed
servers (16 Aug, 10, 15 Sep, 14 Oct 2004)