head 1.11; access; symbols pkgsrc-2026Q1:1.11.0.82 pkgsrc-2026Q1-base:1.11 pkgsrc-2025Q4:1.11.0.80 pkgsrc-2025Q4-base:1.11 pkgsrc-2025Q3:1.11.0.78 pkgsrc-2025Q3-base:1.11 pkgsrc-2025Q2:1.11.0.76 pkgsrc-2025Q2-base:1.11 pkgsrc-2025Q1:1.11.0.74 pkgsrc-2025Q1-base:1.11 pkgsrc-2024Q4:1.11.0.72 pkgsrc-2024Q4-base:1.11 pkgsrc-2024Q3:1.11.0.70 pkgsrc-2024Q3-base:1.11 pkgsrc-2024Q2:1.11.0.68 pkgsrc-2024Q2-base:1.11 pkgsrc-2024Q1:1.11.0.66 pkgsrc-2024Q1-base:1.11 pkgsrc-2023Q4:1.11.0.64 pkgsrc-2023Q4-base:1.11 pkgsrc-2023Q3:1.11.0.62 pkgsrc-2023Q3-base:1.11 pkgsrc-2023Q2:1.11.0.60 pkgsrc-2023Q2-base:1.11 pkgsrc-2023Q1:1.11.0.58 pkgsrc-2023Q1-base:1.11 pkgsrc-2022Q4:1.11.0.56 pkgsrc-2022Q4-base:1.11 pkgsrc-2022Q3:1.11.0.54 pkgsrc-2022Q3-base:1.11 pkgsrc-2022Q2:1.11.0.52 pkgsrc-2022Q2-base:1.11 pkgsrc-2022Q1:1.11.0.50 pkgsrc-2022Q1-base:1.11 pkgsrc-2021Q4:1.11.0.48 pkgsrc-2021Q4-base:1.11 pkgsrc-2021Q3:1.11.0.46 pkgsrc-2021Q3-base:1.11 pkgsrc-2021Q2:1.11.0.44 pkgsrc-2021Q2-base:1.11 pkgsrc-2021Q1:1.11.0.42 pkgsrc-2021Q1-base:1.11 pkgsrc-2020Q4:1.11.0.40 pkgsrc-2020Q4-base:1.11 pkgsrc-2020Q3:1.11.0.38 pkgsrc-2020Q3-base:1.11 pkgsrc-2020Q2:1.11.0.34 pkgsrc-2020Q2-base:1.11 pkgsrc-2020Q1:1.11.0.14 pkgsrc-2020Q1-base:1.11 pkgsrc-2019Q4:1.11.0.36 pkgsrc-2019Q4-base:1.11 pkgsrc-2019Q3:1.11.0.32 pkgsrc-2019Q3-base:1.11 pkgsrc-2019Q2:1.11.0.30 pkgsrc-2019Q2-base:1.11 pkgsrc-2019Q1:1.11.0.28 pkgsrc-2019Q1-base:1.11 pkgsrc-2018Q4:1.11.0.26 pkgsrc-2018Q4-base:1.11 pkgsrc-2018Q3:1.11.0.24 pkgsrc-2018Q3-base:1.11 pkgsrc-2018Q2:1.11.0.22 pkgsrc-2018Q2-base:1.11 pkgsrc-2018Q1:1.11.0.20 pkgsrc-2018Q1-base:1.11 pkgsrc-2017Q4:1.11.0.18 pkgsrc-2017Q4-base:1.11 pkgsrc-2017Q3:1.11.0.16 pkgsrc-2017Q3-base:1.11 pkgsrc-2017Q2:1.11.0.12 pkgsrc-2017Q2-base:1.11 pkgsrc-2017Q1:1.11.0.10 pkgsrc-2017Q1-base:1.11 pkgsrc-2016Q4:1.11.0.8 pkgsrc-2016Q4-base:1.11 pkgsrc-2016Q3:1.11.0.6 pkgsrc-2016Q3-base:1.11 pkgsrc-2016Q2:1.11.0.4 pkgsrc-2016Q2-base:1.11 pkgsrc-2016Q1:1.11.0.2 pkgsrc-2016Q1-base:1.11 pkgsrc-2015Q4:1.10.0.6 pkgsrc-2015Q4-base:1.10 pkgsrc-2015Q3:1.10.0.4 pkgsrc-2015Q3-base:1.10 pkgsrc-2015Q2:1.10.0.2 pkgsrc-2015Q2-base:1.10 pkgsrc-2015Q1:1.9.0.12 pkgsrc-2015Q1-base:1.9 pkgsrc-2014Q4:1.9.0.10 pkgsrc-2014Q4-base:1.9 pkgsrc-2014Q3:1.9.0.8 pkgsrc-2014Q3-base:1.9 pkgsrc-2014Q2:1.9.0.6 pkgsrc-2014Q2-base:1.9 pkgsrc-2014Q1:1.9.0.4 pkgsrc-2014Q1-base:1.9 pkgsrc-2013Q4:1.9.0.2 pkgsrc-2013Q4-base:1.9 pkgsrc-2013Q3:1.8.0.44 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.42 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.40 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.38 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.36 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.34 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.32 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.30 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.28 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.26 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.24 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.8.0.22 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.8.0.20 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.8.0.18 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.16 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.8.0.14 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.8.0.12 pkgsrc-2009Q3-base:1.8 pkgsrc-2009Q2:1.8.0.10 pkgsrc-2009Q2-base:1.8 pkgsrc-2009Q1:1.8.0.8 pkgsrc-2009Q1-base:1.8 pkgsrc-2008Q4:1.8.0.6 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.4 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.2 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.7.0.24 pkgsrc-2008Q2-base:1.7 cwrapper:1.7.0.22 pkgsrc-2008Q1:1.7.0.20 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.18 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.16 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.14 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.12 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.10 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.8 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.6 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.4 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.2 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.6.0.6 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.4 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.2 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.5.0.8 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.6 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.4 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.5.0.2 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.4.0.2 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.2.0.4 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.6 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.2 pkgviews-base:1.2 buildlink2:1.1.1.1.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.1.1.1 netbsd-1-5-PATCH001:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.11 date 2016.02.09.07.02.54; author adam; state Exp; branches; next 1.10; commitid 1yhwGsmSTFZe2dUy; 1.10 date 2015.05.12.07.49.16; author kim; state Exp; branches; next 1.9; commitid A4U6QsG2Skrd48ly; 1.9 date 2013.10.22.19.27.52; author drochner; state Exp; branches 1.9.12.1; next 1.8; commitid TsawvOo6dxoG8kax; 1.8 date 2008.08.10.11.09.01; author kim; state Exp; branches; next 1.7; 1.7 date 2005.10.12.22.26.59; author wiz; state Exp; branches; next 1.6; 1.6 date 2005.01.02.17.46.39; author wiz; state Exp; branches; next 1.5; 1.5 date 2004.01.08.20.49.39; author xtraeme; state Exp; branches; next 1.4; 1.4 date 2003.09.30.14.57.25; author jmmv; state Exp; branches; next 1.3; 1.3 date 2003.09.09.17.11.17; author jmmv; state Exp; branches; next 1.2; 1.2 date 2002.05.15.07.28.52; author martti; state Exp; branches; next 1.1; 1.1 date 2000.11.21.06.02.28; author hubertf; state Exp; branches 1.1.1.1; next ; 1.9.12.1 date 2015.05.13.18.33.59; author tron; state Exp; branches; next ; commitid yalQUOz4DskNBjly; 1.1.1.1 date 2000.11.21.06.02.28; author hubertf; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.06.23.18.37.50; author jlam; state Exp; branches; next ; desc @@ 1.11 log @Changes 2.4.3: Fixes CVE-2005-0837. The vulnerability, identified as CVE-2005-0837, allows an attacker to acces the raw XSLT template file by appending a dot “.” to the URL. Due to the way how Windows handles file names ending with a dot, it only affects Icecast versions < 2.4.3 running on Windows. Icecast on other operating systems, like Linux, wasn’t affected at any time by this issue. If you haven’t modified the default XSLT files of a Windows installation, then no information disclosure of real value could have happened. We expect that most, of the comparatively few, Windows installations have unmodified template files and thus, while technically vulnerable, only expose those unmodified templates. To be clear, no runtime information can be accessed this way. @ text @$NetBSD: patch-ab,v 1.10 2015/05/12 07:49:16 kim Exp $ Allow for paths, user and group to be set via pkgsrc Makefile. Decrease amount of logging a little bit by default. --- conf/icecast.xml.in.orig 2015-04-08 08:06:13.000000000 +0000 +++ conf/icecast.xml.in 2015-05-12 07:19:45.000000000 +0000 @@@@ -191,14 +191,14 @@@@ - @@pkgdatadir@@ + @@BASEDIR@@ - @@localstatedir@@/log/@@PACKAGE@@ - @@pkgdatadir@@/web - @@pkgdatadir@@/admin - + @@LOGDIR@@ + @@WEBROOT@@ + @@ADMINROOT@@ + @@PIDDIR@@/icecast.pid - 3 + 2 10000 @ 1.10 log @Upgrade to icecast-2.4.2. Addresses a security issue with "stream_auth" (not used by default). http://lists.xiph.org/pipermail/icecast-dev/2015-April/002460.html @ text @d1 1 a1 1 $NetBSD$ d6 2 a7 2 --- conf/icecast.fixme.orig 2015-04-08 08:06:13.000000000 +0000 +++ conf/icecast.fixme 2015-05-12 07:19:45.000000000 +0000 @ 1.9 log @update to 2.3.3 changes: -fixed 3 security issues: -Improved HTTPS cipher handling and added support for chained certificates -Allow the source password to be undefined -Prevent error log injection of control characters by substituting non-alphanumeric characters with a '.' (CVE-2011-4612) -Bugfixes -Sources can now be authenticated via URL, like listeners -XSL update pkgsrc change: don't set the "chroot" flag in the installed sample config file -- this configuration doesn't work without further work because the web server misses its data files in the sandbox approved by The Maintainer @ text @d3 6 a8 3 --- conf/icecast.fixme.orig 2012-06-11 16:45:19.000000000 +0000 +++ conf/icecast.fixme @@@@ -131,14 +131,14 @@@@ d11 1 a11 1 d28 1 a28 1 @@@@ -158,7 +158,7 @@@@ d32 3 a34 3 - 3 + 2 10000 d37 1 a37 1 @@@@ -172,8 +172,8 @@@@ @ 1.9.12.1 log @Pullup ticket #4712 - requested by kim audio/icecast: security update Revisions pulled up: - audio/icecast/Makefile 1.59 - audio/icecast/PLIST 1.17 - audio/icecast/distinfo 1.20 - audio/icecast/patches/patch-aa 1.6 - audio/icecast/patches/patch-ab 1.10 - audio/icecast/patches/patch-ac 1.5 - audio/icecast/patches/patch-ad deleted --- Module Name: pkgsrc Committed By: kim Date: Tue May 12 07:49:16 UTC 2015 Modified Files: pkgsrc/audio/icecast: Makefile PLIST distinfo pkgsrc/audio/icecast/patches: patch-aa patch-ab patch-ac Removed Files: pkgsrc/audio/icecast/patches: patch-ad Log Message: Upgrade to icecast-2.4.2. Addresses a security issue with "stream_auth" (not used by default). http://lists.xiph.org/pipermail/icecast-dev/2015-April/002460.html @ text @d3 3 a5 6 Allow for paths, user and group to be set via pkgsrc Makefile. Decrease amount of logging a little bit by default. --- conf/icecast.fixme.orig 2015-04-08 08:06:13.000000000 +0000 +++ conf/icecast.fixme 2015-05-12 07:19:45.000000000 +0000 @@@@ -191,14 +191,14 @@@@ d8 1 a8 1 d25 1 a25 1 @@@@ -222,7 +222,7 @@@@ d29 3 a31 3 - 3 + 2 10000 d34 1 a34 1 @@@@ -236,8 +236,8 @@@@ @ 1.8 log @Upgrade to icecast-2.3.2 @ text @d3 3 a5 3 --- conf/icecast.fixme.orig 2008-04-04 18:14:10.000000000 +0300 +++ conf/icecast.fixme 2008-06-21 13:12:37.000000000 +0300 @@@@ -125,14 +125,14 @@@@ d25 1 a25 1 @@@@ -152,7 +152,7 @@@@ d34 2 a35 6 @@@@ -163,11 +163,11 @@@@ - 0 + 1 @ 1.7 log @Update to 2.3.0. Slightly based on PR 31558 by Eric Schnoebelen. **** New features for 2.3.0 **** - Streaming support for ogg speex, ogg flac, ogg midi - intro file support - per mount settable Intro files will play when a listener first connects to a stream. This is designed for station jingles and the like. If you don't broadcast in ogg vorbis, you must make sure the bitrate/samplerate/number of channels match up to your stream. - on-demand relays, global and per-relay settable On demand relays only connect to the relayed content when there are listeners attached to the relay. This can save bandwidth in certain cases. - fallback to file, extends on the intro file handling. With this feature, you can specify a "fallback file" which will be played in a loop and sent your currently connected listeners in the event of a source client disconnect. This means your listeners stay connected while you fix your disconnect problem. Same rules regarding bitrate/samplerate/ number of channels apply as with intro files. - new mount-level settings 1. public, type/subtype, genre settings, stream description, stream url, stream name, bitrate (override what is sent from the source client) 2. mp3 metadata interval 3. on-[dis]connect scripts can be stated per-mount, invoked at source start/stop and take 1 arg which is the mountpoint. - New URL listener authenticator. This delegates your listener authorization to an external application. URL calls are made on listener connect/disconnect as well as source connect/disconnect. It is meant for large broadcasters who have existing authentication systems that need to be integrated into. Included is an example php-based application that can be used in conjunction with the url authenticator to manage a simple subscription-based broadcast. - HTPasswd authenticator uses in-memory structures now. - On demand files now can be fed through an authenticator - Update to admin/web xslt interface - Icecast can now be installed as a win32 service **** Fixes for 2.3.0 **** - real/helix works - win32 access log correct - stats client is stable now (curl -X STATS http://admin@@host:port/) - show mountpoints on stats that are inactive but have an active fallback - more updates over HUP possible - improved stability under heavy load - moving clients will no longer sometimes deadlock the server - avoid small writes to reduce TCP overhead. pkg changes: Enable theora, speex. make libxml2 dependency explicit. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.6 2005/01/02 17:46:39 wiz Exp $ d3 3 a5 3 --- conf/icecast.fixme.orig 2005-09-08 16:03:51.000000000 +0200 +++ conf/icecast.fixme @@@@ -132,14 +132,15 @@@@ d18 1 a18 2 + + @@LOGDIR@@/ d25 1 a25 1 @@@@ -159,15 +160,15 @@@@ d29 1 a29 1 - 4 d31 4 @ 1.6 log @Update to 2.2.0. Tested by kim@@, fixes PR 28835. ****New features for 2.2 (in no particular order):**** - Theora Video support - Icecast now supports video streaming via theora. Currently, we require the latest (alpha 4) version of libtheora. This is an optional compile, so if you don't have theora then icecast will safely ignore it - Shoutcast style source client support - Icecast now supports the connection protocol used by the Shoutcast DSP source client. This is the same connection protocol used by their NSV encoding tools. This means that not only can you use the Shoutcast DSP to stream to icecast, but that you can also stream NSV via their tools. - AAC is added as a supported streaming format - Not too many source clients support streaming in this format, but we support it. - Cluster password - Now you can specify a cluster password as a option in the config. This will allow you to cluster multiple servers/mounts into a single listing on the stream directory. Note that this is different than "grouping" which groups together streams coming from the same physical IP and with the same stream name. Clusters are meant for relays of the same stream and will only be listed *once* in the stream directory. When a listener tunes into a cluster, they will be served an m3u file with all the clusters for that stream. - Playlist Log - This is an option setting that will create an audit trail of metadata that comes through icecast. It is a single file that contains information for all mountpoints. - Range Support for static files - We now support seeking in files served off the icecast fserve. - Metadata Update via Admin - We now support metadata updates via the admin interface for both MP3 AND Ogg Vorbis streams. - Per mount hidden stats and YP prevention - You many now indicate certains mounts to be excluded (i.e. hidden) from the main status.xsl page. This is useful when using local private relays. You can also override the YP setting (as in disable) on a per-mount basis. Also useful for local private relays. - Multiple example config files - We now have multiple config files for you to use as a base. A "simple" one for quick-start, and a more detailed "advanced" one with all the features, as well as a "shoutcast compatable" one, which shows how you'd config for using the shoutcast DSP. - Relay user/pass - You can now specify authentication used by a relay. This is for the case where you have listener authentication enabled for a mountpoint, and want to connect a relay to it. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.5 2004/01/08 20:49:39 xtraeme Exp $ d3 1 a3 1 --- conf/icecast.fixme.orig 2004-12-02 22:15:35.000000000 +0100 d5 1 a5 1 @@@@ -110,14 +110,15 @@@@ d26 1 a26 1 @@@@ -137,15 +138,15 @@@@ @ 1.5 log @Updated to 2.0.0 @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1.1.1 2004/01/08 19:39:42 xtraeme Exp $ d3 3 a5 3 --- conf/icecast.fixme.orig 2004-01-08 19:10:14.000000000 +0100 +++ conf/icecast.fixme 2004-01-08 19:14:15.000000000 +0100 @@@@ -82,14 +82,15 @@@@ d26 1 a26 2 @@@@ -103,16 +104,14 @@@@ d29 1 a35 1 - a45 1 @ 1.4 log @Fix sysconfdir conversion: - Pass --sysconfdir to configure script. - Make the program honour that directory to search for config files. - Remove un-needed patch (everything can be done from configure). @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2003/09/09 17:11:17 jmmv Exp $ d3 3 a5 24 --- configure.orig 2002-04-11 00:50:20.000000000 +0200 +++ configure @@@@ -876,16 +876,16 @@@@ if test "x$enable_fsstd" = "xyes"; then else ICECAST_BINDIR=${prefix}/bin ICECAST_SBINDIR=${prefix}/bin - ICECAST_ETCDIR=conf - ICECAST_ETCDIR_INST=${prefix}/conf + ICECAST_ETCDIR=${sysconfdir} + ICECAST_ETCDIR_INST=${prefix}/share/examples/icecast ICECAST_SHAREDIR=${prefix} ICECAST_LOGDIR=logs - ICECAST_LOGDIR_INST=${prefix}/logs + ICECAST_LOGDIR_INST=/var/log/icecast ICECAST_TEMPLATEDIR=templates - ICECAST_TEMPLATEDIR_INST=${prefix}/templates + ICECAST_TEMPLATEDIR_INST=${prefix}/share/icecast/templates ICECAST_STATICDIR=static - ICECAST_STATICDIR_INST=${prefix}/static - ICECAST_DOCDIR=${prefix}/doc + ICECAST_STATICDIR_INST=${prefix}/share/icecast/static + ICECAST_DOCDIR=${prefix}/share/doc/icecast USE_FSSTD=no fi d7 4 a10 1 @@@@ -1540,7 +1540,7 @@@@ EOF d12 35 a46 7 echo "$ac_t""BSD/OS" 1>&6 ;; - *BSD*) + unused) __SOMEBSD__=yes cat >> confdefs.h <<\EOF #define __SOMEBSD__ 1 @ 1.3 log @Use PTHREAD_* variables to avoid passing the unknown -pthreads flag to the compiler. Fixes PR pkg/19501. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2002/05/15 07:28:52 martti Exp $ d5 2 a6 1 @@@@ -877,15 +877,15 @@@@ else d9 1 a9 1 ICECAST_ETCDIR=conf d11 2 a12 1 + ICECAST_ETCDIR_INST=${prefix}/etc/icecast @ 1.2 log @Updated icecast to 1.3.12 This release is a security update and all users are highly encouraged to upgrade immediately! (ChangeLog doesn't give exact details, it was updated 2000-03-01) @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 06:02:28 hubertf Exp $ d3 3 a5 3 --- configure.orig Thu Apr 11 00:50:20 2002 +++ configure Wed May 15 09:22:11 2002 @@@@ -877,15 +877,15 @@@@ d26 9 @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- configure.orig Tue Nov 21 06:35:44 2000 +++ configure @@@@ -880,15 +880,15 @@@@ @ 1.1.1.1 log @Add icecast-1.3.7: Icecast is an Internet based broadcasting system based on the Mpeg Layer III streaming technology. It is, however, not limited to streaming mp3 files. It was originally inspired by Nullsoft's Shoutcast and also mp3serv by Scott Man ley. @ text @@ 1.1.1.1.2.1 log @Merge from pkgsrc-current to buildlink2 branch. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2002/05/15 07:28:52 martti Exp $ d3 3 a5 3 --- configure.orig Thu Apr 11 00:50:20 2002 +++ configure Wed May 15 09:22:11 2002 @@@@ -877,15 +877,15 @@@@ @