[Pkg-wmaker-commits] [wmbiff] 03/09: Backed out hoehoe's patch, preparing to apply Neil's.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 20 02:59:58 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to tag wmbiff_0_3_2
in repository wmbiff.
commit e2e16d60daf7faee82396de795e8855ca1f17cd5
Author: jordi <jordi>
Date: Thu Oct 4 08:54:02 2001 +0000
Backed out hoehoe's patch, preparing to apply Neil's.
---
ChangeLog | 19 +++++++++++++++----
NEWS | 6 ------
README | 8 ++++----
wmbiff/Client.h | 10 +++-------
wmbiff/Makefile | 6 +++---
wmbiff/sample.wmbiffrc | 12 +-----------
wmbiff/wmbiff.1 | 4 ++--
wmbiff/wmbiff.c | 6 ++----
wmbiff/wmbiffrc.5 | 10 +---------
9 files changed, 31 insertions(+), 50 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 61b5f42..81b23e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,12 +5,23 @@ The latest changelog entry is in a different format, because it's inserted by
CVS on commit.
$Log: ChangeLog,v $
- Revision 1.11 2001/09/24 11:58:39 oskuro
- Added APOP support, patch from NAKAYAMA Takao <hoehoe at wakaba.jp>.
- Fixed some bits of the manpage (Jordi)
- Bumped version to 0.3.2.
+ Revision 1.12 2001/10/04 08:54:02 jordi
+ Backed out hoehoe's patch, preparing to apply Neil's.
+2001-09-24 Monday 11:58 UTC -- Jordi Mallach <jordi at sindominio.net>
+
+ * ChangeLog, NEWS, README, wmbiff/ApopClient.c, wmbiff/Client.h,
+ wmbiff/Makefile, wmbiff/sample.wmbiffrc, wmbiff/wmbiff.1,
+ wmbiff/wmbiff.c, wmbiff/wmbiffrc.5: Added APOP support, patch from
+ NAKAYAMA Takao <hoehoe at wakaba.jp>. Fixed some bits of the manpage
+ (Jordi) Bumped version to 0.3.2.
+
+2001-09-24 Monday 11:56 UTC -- Jordi Mallach <jordi at sindominio.net>
+
+ * maint/prerelease.sh: Removed -t to cvs2cl invocation, to make
+ cleaner ChangeLogs.
+
2001-06-24 Sunday 18:17 UTC -- Jordi Mallach <jordi at sindominio.net>
* ChangeLog, NEWS: Released wmbiff 0.3.1.
diff --git a/NEWS b/NEWS
index 3f8554a..d636b49 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,6 @@
Release Notes
~~~~~~~~~~~~~
-Release 0.3.2 - Mon, 24 Sep 2001 13:41:16 +0200
-
- * Added APOP support from NAKAYAMA Takao.
- * Updates and fixes to documentation. (Jordi)
-
-
Release 0.3.1 - Sun, 24 Jun 2001 20:15:41 +0200
* Replaced /var/spool/mail with /var/mail, which is what the FHS mandates.
diff --git a/README b/README
index fac6100..6db9dac 100644
--- a/README
+++ b/README
@@ -11,8 +11,8 @@
Yellow digits display number of unread messages, with blinking on new
mail arrival, if any.
- At this moment unix-style (mbox), maildir POP3, APOP and IMAP mailboxes
- are supported. wmBiff also understands Licq's history files.
+ At this moment unix-style (mbox), maildir POP3 and IMAP mailboxes are
+ supported. wmBiff also understands Licq's history files.
wmBiff supports up to 5 mailboxes (but you can start 2 or more
wmbiff's with differrent configs).
@@ -79,8 +79,8 @@ position. All other positions will be empty.
Mark Hurley (debian4tux at telocity.com)
Rob Funk (rfunk at funkinet.net)
NAKAYAMA Takao (hoehoe at wakaba.jp)
-
-
+
+
_________________________________________________________________
Any suggestions/bug reports please send to our mailing list,
diff --git a/wmbiff/Client.h b/wmbiff/Client.h
index a9ffa4a..f3fb7fd 100644
--- a/wmbiff/Client.h
+++ b/wmbiff/Client.h
@@ -1,12 +1,11 @@
-/* $Id: Client.h,v 1.3 2001/09/24 11:58:39 oskuro Exp $ */
+/* $Id: Client.h,v 1.4 2001/10/04 08:54:02 jordi Exp $ */
/* Author : Scott Holden ( scotth at thezone.net )
Modified : Yong-iL Joh ( tolkien at mizi.com )
Modified : Jorge Garc�a ( Jorge.Garcia at uv.es )
- Modified : NAKAYAMA Takao ( hoehoe at wakaba.jp )
*
- * Email Checker Pop3/APOP/Imap4/Licq/mbox/maildir
+ * Email Checker Pop3/Imap4/Licq/mbox/maildir
*
- * Last Updated : Mon Sep 3 21:48:26 JST 2001
+ * Last Updated : Mar 20, 05:32:35 CET 2001
*
*/
@@ -65,15 +64,12 @@ typedef struct _mbox_t {
#define BUF_SIZE 1024
int sock_connect(char *hostname, int port);
-int apopCreate(Pop3 pc, char *str);
int pop3Create(Pop3 pc, char *str);
int imap4Create(Pop3 pc, char *str);
int licqCreate(Pop3 pc, char *str);
int mboxCreate(Pop3 pc, char *str);
int maildirCreate(Pop3 pc, char *str);
FILE *openMailbox(Pop3 pc);
-int parse_old_apop_path(Pop3 pc, char *str);
-int parse_new_apop_path(Pop3 pc, char *str);
int parse_old_pop3_path(Pop3 pc, char *str);
int parse_new_pop3_path(Pop3 pc, char *str);
diff --git a/wmbiff/Makefile b/wmbiff/Makefile
index bd533d8..bf48dea 100644
--- a/wmbiff/Makefile
+++ b/wmbiff/Makefile
@@ -1,5 +1,5 @@
-# $Id: Makefile,v 1.8 2001/09/24 11:58:39 oskuro Exp $
-WMBIFF_VERSION="0.3.2"
+# $Id: Makefile,v 1.9 2001/10/04 08:54:02 jordi Exp $
+WMBIFF_VERSION="0.3.1"
DESTDIR=
prefix=/usr/local
bindir=${prefix}/bin
@@ -17,7 +17,7 @@ EXTRAFLAGS = -DWMBIFF_VERSION='$(WMBIFF_VERSION)'
# -DDEBUG_MBOX -DDEBUG_MAILDIR -DDEBUG -DDEBUG_MAIL_COUNT
OBJS = wmbiff.o socket.o \
- ApopClient.o Pop3Client.o Imap4Client.o LicqClient.o mboxClient.o \
+ Pop3Client.o Imap4Client.o LicqClient.o mboxClient.o \
maildirClient.o \
../wmgeneral/wmgeneral.o \
../wmgeneral/misc.o \
diff --git a/wmbiff/sample.wmbiffrc b/wmbiff/sample.wmbiffrc
index 06898fb..d7285dd 100644
--- a/wmbiff/sample.wmbiffrc
+++ b/wmbiff/sample.wmbiffrc
@@ -1,4 +1,4 @@
-# $Id: sample.wmbiffrc,v 1.4 2001/09/24 11:58:39 oskuro Exp $
+# $Id: sample.wmbiffrc,v 1.5 2001/10/04 08:54:02 jordi Exp $
#
# Global interval -- seconds between check mailboxes
interval=60
@@ -68,13 +68,3 @@ label.4=IMAP4
path.4=imap:user:password at server
interval.4=300 # 5 minutes
-# More examples
-
-#label.4=APOP
-## apop format: apop:user:password at server[:port]
-#path.4=apop:user:password at server
-#notify.4=my_play /home/gb/sounds/new_mail_has_arrived.wav
-#action.4=rxvt -name mutt -e mutt -f /home/gb/mail/30_nftp-list
-#interval.4=300 # 5 minutes
-#fetchinterval.4=-1
-#fetchcmd.4=fetchmail
diff --git a/wmbiff/wmbiff.1 b/wmbiff/wmbiff.1
index 8315f91..2e1f23f 100644
--- a/wmbiff/wmbiff.1
+++ b/wmbiff/wmbiff.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.\" $Id: wmbiff.1,v 1.3 2001/09/24 11:58:39 oskuro Exp $
+.\" $Id: wmbiff.1,v 1.4 2001/10/04 08:54:02 jordi Exp $
.\"
.\" wmbiff.1 and wmbiffrc.5 are copyright 1999-2001 by
.\" Jordi Mallach <jordi at debian.org>
@@ -20,7 +20,7 @@ WMBiff \- A dockable Mailbox Monitor
WMbiff displays the status of up to five mailboxes. It gives information
about new mail, if any, or total number of messages. It also has mail
retrieval capabilies, and can be configured to do this automatically. At the
-moment, UNIX-style, maildir, POP3, APOP and IMAP4 mailboxes are supported.
+moment, UNIX-style, maildir, POP3, and IMAP4 mailboxes are supported.
WMbiff also supports Licq history files, displaying the number of new
messages in your running Licq session, as if they were mail.
diff --git a/wmbiff/wmbiff.c b/wmbiff/wmbiff.c
index 871d385..a4604bf 100644
--- a/wmbiff/wmbiff.c
+++ b/wmbiff/wmbiff.c
@@ -1,4 +1,4 @@
-/* $Id: wmbiff.c,v 1.5 2001/09/24 11:58:39 oskuro Exp $ */
+/* $Id: wmbiff.c,v 1.6 2001/10/04 08:54:02 jordi Exp $ */
#define USE_POLL
@@ -464,9 +464,7 @@ int ReadLine(FILE * fp, char *setting, char *value, int *index)
void parse_mbox_path(int item)
{
- if (!strncasecmp(mbox[item].path, "apop:", 5)) { /* apop account */
- apopCreate((&mbox[item]), mbox[item].path);
- } else if (!strncasecmp(mbox[item].path, "pop3:", 5)) { /* pop3 account */
+ if (!strncasecmp(mbox[item].path, "pop3:", 5)) { /* pop3 account */
pop3Create((&mbox[item]), mbox[item].path);
} else if (!strncasecmp(mbox[item].path, "licq:", 5)) { /* licq history file */
licqCreate((&mbox[item]), mbox[item].path);
diff --git a/wmbiff/wmbiffrc.5 b/wmbiff/wmbiffrc.5
index 4664256..c557547 100644
--- a/wmbiff/wmbiffrc.5
+++ b/wmbiff/wmbiffrc.5
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.\" $Id: wmbiffrc.5,v 1.3 2001/09/24 11:58:39 oskuro Exp $
+.\" $Id: wmbiffrc.5,v 1.4 2001/10/04 08:54:02 jordi Exp $
.\"
.\" wmbiff.1 and wmbiffrc.5 are copyright 1999-2001 by
.\" Jordi Mallach <jordi at debian.org>
@@ -66,17 +66,9 @@ to 110). If your passwd contained special character, eg. '@' or ':',
use another path format.
.RS
pop3:user:password at server[:port]
-.br
pop3:user password server[ port] (another format)
.RE
.TP
-.I apop
-This type makes wmbiff read mail from APOP servers, using the specified
-username, password, host and an optional port number.
-.RS
-apop:user:password at server[:port]
-.RE
-.TP
.I imap
These are IMAP4 boxes. As with pop3, wmbiff will read a imap4 mbox using
the given values and will display info about the remote mail. This type
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbiff.git
More information about the Pkg-wmaker-commits
mailing list