[Pkg-wmaker-commits] [wmbiff] 44/92: Imported Upstream version 0.4.27
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 20 02:59:25 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmbiff.
commit 86086e9f176d7bd4b75658e2b2e89b1595625373
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Fri Nov 14 08:20:00 2014 -0600
Imported Upstream version 0.4.27
---
ChangeLog | 831 ++++++++++++++++++++++++++-----------------------
Makefile.in | 217 ++++---------
NEWS | 6 +-
TODO | 8 +-
aclocal.m4 | 507 ++++++++++++++++++++++--------
autoconf/Makefile.in | 128 +++-----
autoconf/install-sh | 147 +++++----
autoconf/mkinstalldirs | 128 ++++----
configure | 210 +++++--------
configure.ac | 11 +-
scripts/Makefile.in | 127 +++-----
wmbiff/Client.h | 23 +-
wmbiff/Makefile.in | 238 +++++---------
wmbiff/MessageList.c | 2 -
wmbiff/Pop3Client.c | 204 ++++++++----
wmbiff/gnutls-common.c | 1 +
wmbiff/passwordMgr.c | 2 +-
wmbiff/test_tlscomm.c | 11 +-
wmbiff/test_wmbiff.c | 16 +-
wmbiff/tlsComm.c | 64 +++-
wmbiff/tlsComm.h | 8 +
wmbiff/wmbiff.c | 254 ++++++++-------
wmbiff/wmbiffrc.5 | 10 +-
wmbiff/wmbiffrc.5.in | 6 +-
wmgeneral/Makefile.in | 200 ++++--------
wmgeneral/wmgeneral.c | 7 +-
26 files changed, 1727 insertions(+), 1639 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e0d37f6..efc9359 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+2005-10-08 Saturday 18:13 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * configure.ac: year stale 0.4.26 news
+
+2005-10-07 Friday 03:07 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * wmbiff/wmbiff.c: fix debian #332540: prevent -c 'directory' from
+ making wmbiff run away
+
+2005-05-08 Sunday 21:31 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * wmbiff/: Client.h, MessageList.c, test_tlscomm.c, test_wmbiff.c,
+ tlsComm.c, tlsComm.h, wmbiff.c: changes for gnutls 1.2 and
+ attempt to make wmbiff more responsive to X events while
+ communicating over the network
+
+2004-12-12 Sunday 00:06 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * check-includes.rb: update the portability checker
+
+2004-12-12 Sunday 00:05 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * wmgeneral/wmgeneral.c: allow KeyPress events through
+
+2004-12-12 Sunday 00:03 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * wmbiff/passwordMgr.c: nicer debug message
+
+2004-12-12 Sunday 00:02 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * wmbiff/: gnutls-common.c, test_wmbiff.c: compiler appeasement
+
+2004-12-12 Sunday 00:01 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * wmbiff/: Pop3Client.c, wmbiff.c, wmbiffrc.5.in: tls and password
+ asking support for pop3, keyboard event handling for the main
+ window
+
+2004-10-31 Sunday 22:09 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * wmbiff/tlsComm.c: indent and make tls_check_certificate void
+
2004-10-01 Friday 21:15 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/tlsComm.c: comment the SHUT_WR
@@ -5,12 +47,12 @@
2004-10-01 Friday 21:06 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/tlsComm.c: indent, and return if no certificate came back
- from the far side
+ from the far side
2004-10-01 Friday 21:05 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/socket.c: thwack duplicate error messages about connecting
- to a remote server
+ to a remote server
2004-10-01 Friday 21:02 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -27,7 +69,7 @@
2004-07-03 Saturday 23:43 UTC -- Neil Spring <nspring at cs.washington.edu>
* scripts/security.debian.rb: handle the timeout error explicitly,
- better for disconnected operation
+ better for disconnected operation
2004-07-03 Saturday 23:43 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -36,7 +78,7 @@
2004-06-28 Monday 18:20 UTC -- Neil Spring <nspring at cs.washington.edu>
* scripts/security.debian.rb: fix debian #256505: a small problem
- with the .wmbiff-sdr directory not being created
+ with the .wmbiff-sdr directory not being created
2004-06-23 Wednesday 21:51 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -45,12 +87,12 @@
2004-06-23 Wednesday 21:46 UTC -- Neil Spring <nspring at cs.washington.edu>
* configure.ac, wmbiff/tlsComm.c: probably fix the s390 debian
- build problems
+ build problems
2004-06-20 Sunday 01:03 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/tlsComm.c: oops, should pay attention to the retval of
- tls_compare_certificates
+ tls_compare_certificates
2004-06-19 Saturday 21:38 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -59,24 +101,24 @@
2004-06-19 Saturday 20:53 UTC -- Neil Spring <nspring at cs.washington.edu>
* configure.ac, wmbiff/Client.h, wmbiff/Imap4Client.c,
- wmbiff/Pop3Client.c, wmbiff/gnutls-common.c,
- wmbiff/gnutls-common.h, wmbiff/tlsComm.c, wmbiff/wmbiff.c,
- wmgeneral/wmgeneral.c: 0.4.24, supporting newer gnutls, I think
+ wmbiff/Pop3Client.c, wmbiff/gnutls-common.c,
+ wmbiff/gnutls-common.h, wmbiff/tlsComm.c, wmbiff/wmbiff.c,
+ wmgeneral/wmgeneral.c: 0.4.24, supporting newer gnutls, I think
2004-06-18 Friday 21:29 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/wmbiff.c: paranoid test to see if /var/mail/nspring is
- constructed wrong.
+ constructed wrong.
2004-04-28 Wednesday 00:19 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Client.h, charutil.c, socket.c, test_wmbiff.c, wmbiff.c:
- indent run
+ indent run
2004-04-28 Wednesday 00:18 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: socket.c, test_wmbiff.c: handle ip addresses instead of
- hostnames in sock_connect
+ hostnames in sock_connect
2004-04-27 Tuesday 23:35 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -85,7 +127,7 @@
2004-04-27 Tuesday 23:31 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/test_wmbiff.c: ensure that sock_connect works with IP
- addresses
+ addresses
2004-04-21 Wednesday 21:53 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -94,13 +136,13 @@
2004-04-20 Tuesday 04:55 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: charutil.c, charutil.h, test_wmbiff.c, wmbiff.c: factor
- out comment stripping for testing, which seems to have passed
+ out comment stripping for testing, which seems to have passed
2004-04-06 Tuesday 20:58 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Imap4Client.c, Pop3Client.c, test_wmbiff.c: fix debian
- #242458 -- allow IP addresses as server names for IMAP mailboxes,
- and also for POP3 mailboxes
+ #242458 -- allow IP addresses as server names for IMAP mailboxes,
+ and also for POP3 mailboxes
2004-03-28 Sunday 00:36 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -109,19 +151,20 @@
2004-03-28 Sunday 00:28 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Client.h, Imap4Client.c, Pop3Client.c, ShellClient.c,
- charutil.c, maildirClient.c, mboxClient.c, passwordMgr.c, regulo.c,
- test_tlscomm.c, tlsComm.c, tlsComm.h, wmbiff.c: lots of indent
- changes and a change to let msglst enable header caching for imap
+ charutil.c, maildirClient.c, mboxClient.c, passwordMgr.c,
+ regulo.c, test_tlscomm.c, tlsComm.c, tlsComm.h, wmbiff.c: lots of
+ indent changes and a change to let msglst enable header caching
+ for imap
2004-03-12 Friday 21:35 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/wmbiffrc.5.in: mention courier imapd's means of specifying
- subfolders
+ subfolders
2004-02-14 Saturday 18:10 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Imap4Client.c: bugfix for cyrus imap servers, thanks to
- Jon Ramsey
+ Jon Ramsey
2004-01-01 Thursday 23:47 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -130,8 +173,9 @@
2004-01-01 Thursday 07:47 UTC -- Neil Spring <nspring at cs.washington.edu>
* AUTHORS, wmbiff/Client.h, wmbiff/Imap4Client.c,
- wmbiff/ShellClient.c, wmbiff/maildirClient.c, wmbiff/mboxClient.c,
- wmbiff/passwordMgr.c, wmbiff/wmbiff.c: Sam Izzo's patch
+ wmbiff/ShellClient.c, wmbiff/maildirClient.c,
+ wmbiff/mboxClient.c, wmbiff/passwordMgr.c, wmbiff/wmbiff.c: Sam
+ Izzo's patch
2003-12-30 Tuesday 19:44 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -144,7 +188,7 @@
2003-11-09 Sunday 07:01 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/sample.wmbiffrc: mac os 10.3 mail responds to a different
- way of identifying the inbox
+ way of identifying the inbox
2003-11-09 Sunday 03:16 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -157,7 +201,7 @@
2003-11-08 Saturday 23:46 UTC -- Neil Spring <nspring at cs.washington.edu>
* Makefile.am: helper rule for sourceforge upload (I know, I know,
- maintenance cruft making it into the release, whatever)
+ maintenance cruft making it into the release, whatever)
2003-11-08 Saturday 23:46 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -166,40 +210,39 @@
2003-11-08 Saturday 23:45 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Imap4Client.c: because having both from and subject
- headers is no longer a way to tell when the end has happened, must
- clean up the completed command tag explicitly
+ headers is no longer a way to tell when the end has happened,
+ must clean up the completed command tag explicitly
2003-11-08 Saturday 23:44 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/passwordMgr.c: avoid compiler warning from inconsistent
- def of size_t as passed into printf
+ def of size_t as passed into printf
2003-11-08 Saturday 22:58 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: ShellClient.c, charutil.c: strcpy is not defined to
- handle overlapping regions. valgrind complains, rightly, so
- reimplement lefttrim to avoid such behavior
+ handle overlapping regions. valgrind complains, rightly, so
+ reimplement lefttrim to avoid such behavior
2003-11-08 Saturday 22:17 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/wmbiff.c: bump up default_sleep_interval to clean up
- strace output while bored.
+ strace output while bored.
2003-11-08 Saturday 22:13 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Imap4Client.c: handle messages without subject lines in
- msglst
+ msglst
2003-11-07 Friday 09:11 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/passwordMgr.c: panther (mac 10.3) does not appear to
- null-terminate passwords in the keychain for us
+ null-terminate passwords in the keychain for us
2003-10-29 Wednesday 18:15 UTC -- Neil Spring <nspring at cs.washington.edu>
- * wmbiff/: Imap4Client.c, Imap4Client.c, Pop3Client.c: handle
- capitalized FROM and SUBJECT headers common typical of spam spam
- spam
+ * wmbiff/: Imap4Client.c, Pop3Client.c: handle capitalized FROM and
+ SUBJECT headers common typical of spam spam spam
2003-10-28 Tuesday 23:39 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -212,35 +255,35 @@
2003-10-28 Tuesday 07:09 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Makefile.am, test_tlscomm.c: fix bug reported by
- Jingshao Chen <jingshaochen at sbcglobal.net> with buffering trouble,
- and incorporate a regression test to keep it from accidentally
- popping up again
+ Jingshao Chen <jingshaochen at sbcglobal.net> with buffering
+ trouble, and incorporate a regression test to keep it from
+ accidentally popping up again
2003-10-28 Tuesday 06:56 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: test_tlscomm.c, tlsComm.c: test for proper handling of
- buffering small bits of expected data
+ buffering small bits of expected data
2003-10-26 Sunday 08:33 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Imap4Client.c, passwordMgr.c: sigh, I dislike running
- make indent
+ make indent
2003-10-26 Sunday 08:31 UTC -- Neil Spring <nspring at cs.washington.edu>
* AUTHORS, wmbiff/Pop3Client.c, wmbiff/wmbiffrc.5.in: Paolo
- Gianrossi's patch to provide msglst support for pop3 mailboxes
+ Gianrossi's patch to provide msglst support for pop3 mailboxes
2003-10-26 Sunday 07:42 UTC -- Neil Spring <nspring at cs.washington.edu>
* check-includes.rb, wmbiff/maildirClient.c, wmbiff/socket.c:
- include file reordering, based on wisdom from porting some other
- networky code
+ include file reordering, based on wisdom from porting some other
+ networky code
2003-10-26 Sunday 07:31 UTC -- Neil Spring <nspring at cs.washington.edu>
* scripts/security.debian.rb: fix some ruby1.8 warnings, minor
- cleanup
+ cleanup
2003-10-10 Friday 18:00 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -273,29 +316,30 @@
2003-07-31 Thursday 23:37 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Imap4Client.c: fix some potential bugs - an access of
- freed memory and an uninitialized reference counter
+ freed memory and an uninitialized reference counter
2003-07-20 Sunday 00:52 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: passwordMgr.c, test_wmbiff.c: fix a five-minute old
- regression test failure where null was returned instead of an empty
- string for an empty password. not sure it matters, but maybe.
+ regression test failure where null was returned instead of an
+ empty string for an empty password. not sure it matters, but
+ maybe.
2003-07-20 Sunday 00:44 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/passwordMgr.c: oops, I left a use-after-free bug in the
- askpass code
+ askpass code
2003-07-19 Saturday 23:56 UTC -- Neil Spring <nspring at cs.washington.edu>
* configure.ac, wmbiff/passwordMgr.c: use the apple keychain to
- grab passwords! I can very nearly forget about typing them in
- anymore
+ grab passwords! I can very nearly forget about typing them in
+ anymore
2003-07-10 Thursday 17:44 UTC -- Neil Spring <nspring at cs.washington.edu>
* Makefile.am: ensure that the current directory is not setgid when
- making a distribution; this borks some untars
+ making a distribution; this borks some untars
2003-07-07 Monday 09:00 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -304,13 +348,13 @@
2003-07-07 Monday 08:57 UTC -- Neil Spring <nspring at cs.washington.edu>
* configure.ac, wmbiff/Client.h, wmgeneral/wmgeneral.c: call it
- 0.4.16
+ 0.4.16
2003-07-07 Monday 08:43 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Client.h, Imap4Client.c, passwordMgr.c, test_wmbiff.c:
- fix memfrob * bug (memfrob makes *'s zero, so password length must
- be tracked separately
+ fix memfrob * bug (memfrob makes *'s zero, so password length
+ must be tracked separately
2003-07-04 Friday 21:42 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -319,43 +363,43 @@
2003-07-03 Thursday 11:10 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Imap4Client.c: switch the new header cache to use
- reference counting (better, but possibly buggy) instead of locking
- (dumb, and certainly buggy)
+ reference counting (better, but possibly buggy) instead of
+ locking (dumb, and certainly buggy)
2003-07-03 Thursday 05:39 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Imap4Client.c: try to avoid repetitive complaints of
- failed connections
+ failed connections
2003-07-03 Thursday 05:34 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/socket.c: avoid repetitive error messages when hostname
- lookup fails (such as when disconnected)
+ lookup fails (such as when disconnected)
2003-07-03 Thursday 05:33 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmgeneral/wmgeneral.c: last fix to geometry handling had a
- compiler warning
+ compiler warning
2003-07-03 Thursday 05:12 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmgeneral/wmgeneral.c: try doing geometry the way X intends it to
- be done, at least as far as I can tell.
+ be done, at least as far as I can tell.
2003-07-03 Thursday 01:03 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/wmbiff.c: make #'s comments only if preceded by whitespace
- or at the beginning of the line
+ or at the beginning of the line
2003-07-03 Thursday 00:53 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/wmbiff.c: looks like I'd broken the button click events
- recently
+ recently
2003-07-03 Thursday 00:52 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/sample.wmbiffrc: osascript samples for driving mac mail
- using applescript
+ using applescript
2003-06-30 Monday 23:42 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -364,8 +408,8 @@
2003-06-08 Sunday 07:01 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Client.h, Imap4Client.c, MessageList.c, MessageList.h,
- ShellClient.c: general rewrite of the msglst headers, so that the
- list is pre-cached for responsiveness.
+ ShellClient.c: general rewrite of the msglst headers, so that the
+ list is pre-cached for responsiveness.
2003-06-08 Sunday 06:59 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -374,7 +418,7 @@
2003-06-08 Sunday 06:59 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/wmbiff.c: show a watch pointer while working behind the
- scenes
+ scenes
2003-06-03 Tuesday 04:57 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -391,24 +435,24 @@
2003-04-17 Thursday 01:56 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Client.h, ShellClient.c, passwordMgr.c: space for detail
- in grab command output, use the detail to populate a message list
- in a getheaders function (eg. can see the list of thought to be
- updated packages if using hte security.debian script
+ in grab command output, use the detail to populate a message list
+ in a getheaders function (eg. can see the list of thought to be
+ updated packages if using hte security.debian script
2003-04-17 Thursday 01:54 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/test-wmbiffrc.shell: test usingthe debian script, allows
- trying shell get headers
+ trying shell get headers
2003-04-17 Thursday 01:54 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/tlsComm.c: try to print a helpful hint message to use
- gnutls-cli-debug
+ gnutls-cli-debug
2003-04-16 Wednesday 23:30 UTC -- Neil Spring <nspring at cs.washington.edu>
* configure.ac: downgrade configure.ac use of AM_INIT_AUTOMAKE to
- support automake-1.5
+ support automake-1.5
2003-04-16 Wednesday 08:21 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -417,7 +461,7 @@
2003-04-16 Wednesday 08:18 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Client.h, Imap4Client.c, MessageList.c, MessageList.h,
- tlsComm.c, wmbiff.c: indent run
+ tlsComm.c, wmbiff.c: indent run
2003-04-16 Wednesday 08:16 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -430,7 +474,7 @@
2003-04-16 Wednesday 08:15 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/tlsComm.c: rename state to tls_state for clarity, small
- cleanup, fixes for buffering several lines in an expectation
+ cleanup, fixes for buffering several lines in an expectation
2003-04-16 Wednesday 08:14 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -439,7 +483,7 @@
2003-04-16 Wednesday 08:13 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: MessageList.c, MessageList.h: list new messages,
- currently only with an imap driver
+ currently only with an imap driver
2003-04-09 Wednesday 04:51 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -452,7 +496,7 @@
2003-04-07 Monday 09:41 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/tlsComm.c: fix some info messages - drop complaints about
- version 0.2.3 of gnutls, mention certfile.
+ version 0.2.3 of gnutls, mention certfile.
2003-04-07 Monday 09:33 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -461,13 +505,13 @@
2003-04-07 Monday 09:16 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/tlsComm.c: handle certfile errors properly; positive
- return values from gnutls_certificate_set_x509_trust_file appear
- okay.
+ return values from gnutls_certificate_set_x509_trust_file appear
+ okay.
2003-03-30 Sunday 11:47 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: passwordMgr.c, test_wmbiff.c: oh, now I get why that
- foolish null-termination was present. it's better now
+ foolish null-termination was present. it's better now
2003-03-30 Sunday 11:23 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -480,18 +524,18 @@
2003-03-30 Sunday 11:05 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/passwordMgr.c: remove (unreleased) foolhardy
- null-termination
+ null-termination
2003-03-30 Sunday 10:57 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/test_wmbiff.c: just so as not to confuse anyone that
- wmbiff allows #'s in passwords
+ wmbiff allows #'s in passwords
2003-03-30 Sunday 10:38 UTC -- Neil Spring <nspring at cs.washington.edu>
* README, wmbiff/wmbiff.c, wmgeneral/wmgeneral.c,
- wmgeneral/wmgeneral.h: support setting the background color using
- -bg
+ wmgeneral/wmgeneral.h: support setting the background color using
+ -bg
2003-03-28 Friday 08:16 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -508,7 +552,7 @@
2003-03-11 Tuesday 08:03 UTC -- Neil Spring <nspring at cs.washington.edu>
* configure.ac: provide a helpful message as to where gnutls and
- libgcrypt can be found in configure.ac
+ libgcrypt can be found in configure.ac
2003-03-06 Thursday 21:15 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -517,19 +561,19 @@
2003-03-03 Monday 19:06 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/passwordMgr.c: make returned password length consistent
- with stored password length
+ with stored password length
2003-03-02 Sunday 02:37 UTC -- Neil Spring <nspring at cs.washington.edu>
* configure.ac, wmbiff/Imap4Client.c, wmbiff/passwordMgr.c,
- wmbiff/passwordMgr.h: in-memory frobnication of imap passwords
+ wmbiff/passwordMgr.h: in-memory frobnication of imap passwords
2003-03-02 Sunday 02:17 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Imap4Client.c, Makefile.am, Pop3Client.c, regulo.c,
- regulo.h, socket.c, test_wmbiff.c, wmbiff.c: hostname paranoia
- patch -- use -relax to skip hostname validation check, parse
- ambiguous config lines
+ regulo.h, socket.c, test_wmbiff.c, wmbiff.c: hostname paranoia
+ patch -- use -relax to skip hostname validation check, parse
+ ambiguous config lines
2003-03-02 Sunday 01:04 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -558,7 +602,7 @@
2003-02-08 Saturday 03:42 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmgeneral/: wmgeneral.c, wmgeneral.h: much prefer if wmgeneral
- proclaimed that it would not modify argv; I think it's even true
+ proclaimed that it would not modify argv; I think it's even true
2003-01-28 Tuesday 11:14 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -567,7 +611,7 @@
2003-01-28 Tuesday 11:13 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Imap4Client.c: bugfix to avoid problems with the new regex
- scheme and the default mailbox (aliasing sucks.)
+ scheme and the default mailbox (aliasing sucks.)
2003-01-28 Tuesday 11:12 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -588,7 +632,7 @@
2003-01-25 Saturday 04:32 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Makefile.am: use the non gnu-make form of the
- indent-a-c-file rule
+ indent-a-c-file rule
2003-01-22 Wednesday 01:56 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -597,7 +641,7 @@
2003-01-21 Tuesday 08:56 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/tlsComm.c: fix some minor damage when select is
- interrupted (EINTR)
+ interrupted (EINTR)
2003-01-21 Tuesday 05:55 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -606,7 +650,7 @@
2003-01-20 Monday 19:52 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Makefile.am: add libgcrypt libraries if used to
- test_wmbiff
+ test_wmbiff
2003-01-20 Monday 19:52 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -615,29 +659,29 @@
2003-01-19 Sunday 13:13 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Client.h, Imap4Client.c, Makefile.am, Pop3Client.c,
- ShellClient.c, charutil.c, charutil.h, passwordMgr.c,
- test_wmbiff.c, tlsComm.c, wmbiff.c: general portability fixes,
- including HAVE___ATTRIBUTE__
+ ShellClient.c, charutil.c, charutil.h, passwordMgr.c,
+ test_wmbiff.c, tlsComm.c, wmbiff.c: general portability fixes,
+ including HAVE___ATTRIBUTE__
2003-01-19 Sunday 13:12 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: regulo.c, regulo.h: posix based regular expression
- handling with a not so lame interface
+ handling with a not so lame interface
2003-01-19 Sunday 13:11 UTC -- Neil Spring <nspring at cs.washington.edu>
* configure.ac: portability fixes: HAVE___ATTRIBUTE__ (maybe),
- libnsl (solaris), -no-cpp-precomp (os x)
+ libnsl (solaris), -no-cpp-precomp (os x)
2003-01-04 Saturday 03:39 UTC -- Neil Spring <nspring at cs.washington.edu>
* configure.ac, wmbiff/wmbiff.c: 0.4.12, release to fix bad
- -geometry handling
+ -geometry handling
2003-01-03 Friday 20:37 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/wmbiff.c: fix geometry argument handling bug (Debian
- #175220)
+ #175220)
2002-12-29 Sunday 07:46 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -650,28 +694,28 @@
2002-12-29 Sunday 05:28 UTC -- Neil Spring <nspring at cs.washington.edu>
* scripts/security.debian.rb: didn't mean to commit with a 6 minute
- refresh interval
+ refresh interval
2002-12-29 Sunday 04:54 UTC -- Neil Spring <nspring at cs.washington.edu>
* Makefile.am, check-includes.rb, configure.ac: add scripts
- subdirectory to build system
+ subdirectory to build system
2002-12-29 Sunday 04:54 UTC -- Neil Spring <nspring at cs.washington.edu>
* scripts/: Makefile.am, security.debian.rb: new scripts directory
- to hold debian security checker and install it.
+ to hold debian security checker and install it.
2002-12-29 Sunday 03:25 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/wmbiff.c: general cleanup - use strdup_ordie,
- malloc_ordie. reduce using ints and chars interchangeably. static
- annotations on module-local variables
+ malloc_ordie. reduce using ints and chars interchangeably.
+ static annotations on module-local variables
2002-12-29 Sunday 03:22 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/tlsComm.c: bad_certificate called as if void, so change
- the signature
+ the signature
2002-12-29 Sunday 03:22 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -680,19 +724,19 @@
2002-12-29 Sunday 02:47 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmgeneral/: Makefile.am, wmgeneral.c, wmgeneral.h: make
- AddMouseRegion take an unsigned int for the region index (which is
- an _index_ which means negative values need not apply)
+ AddMouseRegion take an unsigned int for the region index (which
+ is an _index_ which means negative values need not apply)
2002-12-29 Sunday 02:31 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: charutil.c, charutil.h: change signature of *Trim to
- reflect that they can't fail (void instead of int); the return
- values are ignored in wmbiff
+ reflect that they can't fail (void instead of int); the return
+ values are ignored in wmbiff
2002-12-29 Sunday 01:36 UTC -- Neil Spring <nspring at cs.washington.edu>
- * wmbiff/wmbiff.c: reorder functions to avoid pre-declaration.
- should simplify reading the (now very long) code
+ * wmbiff/wmbiff.c: reorder functions to avoid pre-declaration.
+ should simplify reading the (now very long) code
2002-12-29 Sunday 01:11 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -713,33 +757,33 @@
2002-12-29 Sunday 00:37 UTC -- Neil Spring <nspring at cs.washington.edu>
* configure.ac, wmbiff/wmbiff.c: use automake/autoconf defined
- PACKAGE_VERSION and PACKAGE_BUGREPORT
+ PACKAGE_VERSION and PACKAGE_BUGREPORT
2002-12-29 Sunday 00:15 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/passwordMgr.c: support arbitrarily long password query
- commands
+ commands
2002-12-29 Sunday 00:14 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/wmbiff.c: configuration file parsing cleanup, support
- longer configuration options, remove some ad-hockery in favor of
- sscanf
+ longer configuration options, remove some ad-hockery in favor of
+ sscanf
2002-12-13 Friday 05:38 UTC -- Neil Spring <nspring at cs.washington.edu>
* configure.ac, wmbiff/tlsComm.c, wmbiff/wmbiff.1, wmbiff/wmbiff.c:
- 0.4.10, -skip-certificate-check option
+ 0.4.10, -skip-certificate-check option
2002-12-09 Monday 21:45 UTC -- Neil Spring <nspring at cs.washington.edu>
* AUTHORS, wmbiff/sample.wmbiffrc, wmbiff/wmbiff.c,
- wmbiff/wmbiffrc.5.in: Peter McAlpine's globalnotify patch
+ wmbiff/wmbiffrc.5.in: Peter McAlpine's globalnotify patch
2002-12-09 Monday 21:45 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Imap4Client.c: minor change to timeout behavior, just
- delay a while before next check
+ delay a while before next check
2002-12-02 Monday 07:16 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -748,15 +792,15 @@
2002-11-30 Saturday 07:58 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Imap4Client.c: more robust ETIMEDOUT handling -- just
- chill out for a few minues rather than blacklist as a compromise
- between the responsiveness of not retrying unresponsive servers and
- the robustness of prodding on. the right thing is probably a
- non-blocking connect, but that's messy
+ chill out for a few minues rather than blacklist as a compromise
+ between the responsiveness of not retrying unresponsive servers
+ and the robustness of prodding on. the right thing is probably a
+ non-blocking connect, but that's messy
2002-11-15 Friday 08:06 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/tlsComm.c: should really be able to catch these problems
- earler - without gnutls, the build would fail
+ earler - without gnutls, the build would fail
2002-11-15 Friday 08:05 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -765,25 +809,25 @@
2002-11-13 Wednesday 06:44 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/wmbiff.1, wmbiff/wmbiff.c, wmgeneral/wmgeneral.c,
- wmgeneral/wmgeneral.h: a method for not using the withdrawn state
+ wmgeneral/wmgeneral.h: a method for not using the withdrawn state
2002-11-12 Tuesday 08:27 UTC -- Neil Spring <nspring at cs.washington.edu>
* Makefile.am, configure.ac, wmbiff/wmbiff.c, wmbiff/wmbiffrc.5.in,
- wmgeneral/wmgeneral.c, wmgeneral/wmgeneral.h: Allow automatic
- sizing of the wmbiff window, effective for other window managers.
+ wmgeneral/wmgeneral.c, wmgeneral/wmgeneral.h: Allow automatic
+ sizing of the wmbiff window, effective for other window managers.
2002-10-26 Saturday 23:17 UTC -- Jordi Mallach <jordi at sindominio.net>
* FromCVS.sh, autogen.sh: Rename FromCVS.sh to autogen.sh, which is
- the "common" name for such script.
+ the "common" name for such script.
2002-10-26 Saturday 23:15 UTC -- Jordi Mallach <jordi at sindominio.net>
* ChangeLog, Makefile.am, maint/changelog-header,
- maint/prerelease.sh: Stop doing the ChangeLog header hack. Instead,
- remove ChangeLog entirely from CVS and get it generated correctly
- on dist. Remove unneeded maint scripts.
+ maint/prerelease.sh: Stop doing the ChangeLog header hack.
+ Instead, remove ChangeLog entirely from CVS and get it generated
+ correctly on dist. Remove unneeded maint scripts.
2002-10-26 Saturday 23:12 UTC -- Jordi Mallach <jordi at sindominio.net>
@@ -792,22 +836,23 @@
2002-10-20 Sunday 21:58 UTC -- Jordi Mallach <jordi at sindominio.net>
* wmbiff/: wmbiff.1, wmbiffrc.5.in: do not specify Debian
- GNU/Linux... I'm actually more interested in the Hurd right now :)
+ GNU/Linux... I'm actually more interested in the Hurd right now
+ :)
2002-10-14 Monday 05:52 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/maildirClient.c: use mkstemp instead of mktemp to appease
- the compiler
+ the compiler
2002-10-14 Monday 01:47 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/wmbiffrc.5.in: add the 'this file automatically generated'
- tag
+ tag
2002-10-13 Sunday 21:28 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Imap4Client.c, tlsComm.c, tlsComm.h: Check certificate
- hostname, using gnutls's new function
+ hostname, using gnutls's new function
2002-10-13 Sunday 21:27 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -820,7 +865,7 @@
2002-09-25 Wednesday 06:16 UTC -- Neil Spring <nspring at cs.washington.edu>
* FAQ: why doesn't wmbiff update my mailbox count when I read a
- message
+ message
2002-09-20 Friday 19:50 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -829,7 +874,7 @@
2002-09-19 Thursday 07:00 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/test_wmbiff.c: allow test to run when nnot linked with
- gnutls
+ gnutls
2002-09-18 Wednesday 23:45 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -838,23 +883,23 @@
2002-09-18 Wednesday 23:43 UTC -- Neil Spring <nspring at cs.washington.edu>
* ChangeLog, configure.ac, wmbiff/Client.h, wmbiff/Imap4Client.c,
- wmbiff/Makefile.am, wmbiff/maildirClient.c, wmbiff/test_wmbiff.c,
- wmbiff/wmbiffrc.5.in: bugfix to allow imap mailbox filenames to
- contain spaces, test that it works; also, prepare 0.4.8
+ wmbiff/Makefile.am, wmbiff/maildirClient.c, wmbiff/test_wmbiff.c,
+ wmbiff/wmbiffrc.5.in: bugfix to allow imap mailbox filenames to
+ contain spaces, test that it works; also, prepare 0.4.8
2002-09-14 Saturday 18:51 UTC -- Dwayne C. Litzenberger <dlitz at dlitz.net>
* wmbiff/: Client.h, maildirClient.c, wmbiffrc.5.in: *
- maildirClient: Added support for quick checking of writable
- network-mounted maildirs where directory caching normally causes
- unwanted delays.
+ maildirClient: Added support for quick checking of writable
+ network-mounted maildirs where directory caching normally
+ causes unwanted delays.
2002-08-16 Friday 07:55 UTC -- Neil Spring <nspring at cs.washington.edu>
* ChangeLog, configure.ac, autoconf/libgnutls.m4,
- wmbiff/Imap4Client.c, wmbiff/gnutls-common.c,
- wmbiff/gnutls-common.h, wmbiff/tlsComm.c: handle new
- gnutls/gnutls.h convention, release 0.4.7
+ wmbiff/Imap4Client.c, wmbiff/gnutls-common.c,
+ wmbiff/gnutls-common.h, wmbiff/tlsComm.c: handle new
+ gnutls/gnutls.h convention, release 0.4.7
2002-08-06 Tuesday 08:05 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -871,7 +916,7 @@
2002-07-18 Thursday 02:55 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/wmbiff.c: ignore sigpipe, possible bugfix for abnormal
- termination during suspend for imap/gnutls
+ termination during suspend for imap/gnutls
2002-07-04 Thursday 08:00 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -880,9 +925,9 @@
2002-07-04 Thursday 01:07 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Imap4Client.c, Makefile.am, Pop3Client.c, charutil.c,
- tlsComm.c, wmbiff.c: valgrind debugging, and support for -exit.
- some bugs were probably fixed, but since nobody has noticed yet, I
- don't know if they mattered
+ tlsComm.c, wmbiff.c: valgrind debugging, and support for -exit.
+ some bugs were probably fixed, but since nobody has noticed yet,
+ I don't know if they mattered
2002-07-04 Thursday 00:45 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -899,18 +944,18 @@
2002-06-26 Wednesday 19:04 UTC -- Neil Spring <nspring at cs.washington.edu>
* ChangeLog, Makefile.am, autoconf/Makefile.am: die configure.in!
- die acconfig.h!
+ die acconfig.h!
2002-06-26 Wednesday 18:56 UTC -- Neil Spring <nspring at cs.washington.edu>
* ChangeLog, FromCVS.sh, Makefile.am, configure.ac, configure.in,
- autoconf/acconfig.h: migrate to newer autoconf (2.5) to try to
- debug making-from-scratch problem and get rid of acconfig.h cruft
+ autoconf/acconfig.h: migrate to newer autoconf (2.5) to try to
+ debug making-from-scratch problem and get rid of acconfig.h cruft
2002-06-25 Tuesday 23:52 UTC -- Neil Spring <nspring at cs.washington.edu>
* Makefile.am: tiny automake 1.6 fix (doesn't appear to use
- stamp-h. who knew.)
+ stamp-h. who knew.)
2002-06-25 Tuesday 23:33 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -919,19 +964,19 @@
2002-06-25 Tuesday 23:29 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Makefile.am: never underestimate the complexity of
- solutions involving automake
+ solutions involving automake
2002-06-25 Tuesday 23:24 UTC -- Neil Spring <nspring at cs.washington.edu>
* configure.in, wmbiff/Makefile.am: corrections to conditional
- compilation of gnutls-common for automake 1.5 (and thereby the true
- automake way)
+ compilation of gnutls-common for automake 1.5 (and thereby the
+ true automake way)
2002-06-25 Tuesday 23:15 UTC -- Neil Spring <nspring at cs.washington.edu>
* configure.in, wmbiff/Makefile.am: only compile gnutls-common.[ch]
- if gnutls is configured in (duh), and only check for gcrypt.h if
- libgcrypt is installed and current
+ if gnutls is configured in (duh), and only check for gcrypt.h if
+ libgcrypt is installed and current
2002-06-24 Monday 07:18 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -947,23 +992,23 @@
2002-06-24 Monday 01:23 UTC -- Neil Spring <nspring at cs.washington.edu>
- * wmbiff/Makefile.am, configure.in, wmbiff/Makefile.am: basic
- gnutls 0.4.3 support (that is, it compiles.)
+ * wmbiff/Makefile.am, configure.in: basic gnutls 0.4.3 support
+ (that is, it compiles.)
2002-06-24 Monday 01:18 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: gnutls-common.c, gnutls-common.h, tlsComm.c: basic
- gnutls 0.4.3 support (that is, it compiles.)
+ gnutls 0.4.3 support (that is, it compiles.)
2002-06-23 Sunday 01:26 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/wmbiff.c: cleanup to periodic mail checking, removal of
- the first mail check - now all cases are the same
+ the first mail check - now all cases are the same
2002-06-21 Friday 04:34 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/wmbiff.c: y_ and x_origin, and num_mailboxes constants,
- highlight color for fn, restructured mailbox creation routines
+ highlight color for fn, restructured mailbox creation routines
2002-06-21 Friday 04:31 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -972,8 +1017,8 @@
2002-06-21 Friday 04:31 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: LicqClient.c, ShellClient.c, charutil.c,
- maildirClient.c, mboxClient.c, passwordMgr.c, test_wmbiff.c:
- config.h
+ maildirClient.c, mboxClient.c, passwordMgr.c, test_wmbiff.c:
+ config.h
2002-06-21 Friday 04:30 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -990,7 +1035,7 @@
2002-06-21 Friday 04:28 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Makefile.am: verify that config.h is included in each .c
- file
+ file
2002-06-15 Saturday 09:05 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1011,12 +1056,12 @@
2002-06-08 Saturday 22:15 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmgeneral/: wmgeneral.c, wmgeneral.h: font support, ability to
- erase rectangles
+ erase rectangles
2002-06-08 Saturday 22:14 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Client.h: slightly changed debug messages; exists() is
- more a test -f than a test -e
+ more a test -f than a test -e
2002-06-08 Saturday 22:13 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1025,12 +1070,13 @@
2002-06-08 Saturday 22:13 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Imap4Client.c, ShellClient.c: cleanup for splint
- annotations
+ annotations
2002-06-08 Saturday 22:13 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/wmbiff.c: basic font support, color selection, cleanup to
- default configuration code, bugifx and cleanup to mouse region code
+ default configuration code, bugifx and cleanup to mouse region
+ code
2002-06-08 Saturday 21:40 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1043,12 +1089,12 @@
2002-06-01 Saturday 17:58 UTC -- Neil Spring <nspring at cs.washington.edu>
* configure.in, wmbiff/wmbiff.c: oops, didn't really want to
- release with the crazy font stuff quite yet
+ release with the crazy font stuff quite yet
2002-06-01 Saturday 07:03 UTC -- Neil Spring <nspring at cs.washington.edu>
* ChangeLog, configure.in, wmbiff/test-wmbiffrc.shell: release
- 0.4.1
+ 0.4.1
2002-06-01 Saturday 07:01 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1065,7 +1111,7 @@
2002-06-01 Saturday 06:02 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Client.h, ShellClient.c, charutil.c, mboxClient.c:
- indent run
+ indent run
2002-06-01 Saturday 06:01 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1074,7 +1120,7 @@
2002-06-01 Saturday 06:00 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/tlsComm.c: a start at certificate checking (a daunting
- task at the moment)
+ task at the moment)
2002-06-01 Saturday 05:59 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1083,7 +1129,7 @@
2002-06-01 Saturday 05:51 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmgeneral/wmgeneral.c: some basic font support, renaming some
- variables for clarity
+ variables for clarity
2002-06-01 Saturday 05:45 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1092,7 +1138,7 @@
2002-06-01 Saturday 05:42 UTC -- Neil Spring <nspring at cs.washington.edu>
* configure.in, wmbiff/socket.c: IPv6 support using getaddrinfo
- from Jun-ichiro itojun Hagino <itojun at iijlab.net>
+ from Jun-ichiro itojun Hagino <itojun at iijlab.net>
2002-05-03 Friday 05:51 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1101,12 +1147,12 @@
2002-05-03 Friday 05:51 UTC -- Neil Spring <nspring at cs.washington.edu>
* Makefile.am: don't list TODO changes in ChangeLog, to avoid
- confusion
+ confusion
2002-05-03 Friday 05:43 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/mboxClient.c: type casting hackery to help architectures I
- don't have
+ don't have
2002-05-03 Friday 05:42 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1115,29 +1161,29 @@
2002-05-03 Friday 05:42 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/ShellClient.c: bugfix when alternates between numeric and
- text
+ text
2002-04-29 Monday 02:01 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Client.h, ShellClient.c, charutil.c, charutil.h: lclint
- cleanups - strdup_ordie, some null annotations
+ cleanups - strdup_ordie, some null annotations
2002-04-27 Saturday 08:54 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Client.h, ShellClient.c, passwordMgr.c: cleanup to use
- grabCommandOutput in passwordMgr instead of duplicating the
- popen/fgets/pclose code
+ grabCommandOutput in passwordMgr instead of duplicating the
+ popen/fgets/pclose code
2002-04-27 Saturday 08:29 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Client.h, Makefile.am, charutil.c, passwordMgr.c,
- passwordMgr.h, test_wmbiff.c: move passwordMgr testing to
- test_wmbiff.c; catch a small bug in handling empty passwords
+ passwordMgr.h, test_wmbiff.c: move passwordMgr testing to
+ test_wmbiff.c; catch a small bug in handling empty passwords
2002-04-27 Saturday 08:29 UTC -- Neil Spring <nspring at cs.washington.edu>
* FromCVS.sh: apparently aclocal barfs when macros are defined both
- in the system directory and in a local copy. semper fragile.
+ in the system directory and in a local copy. semper fragile.
2002-04-25 Thursday 20:28 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1150,14 +1196,14 @@
2002-04-25 Thursday 17:31 UTC -- Neil Spring <nspring at cs.washington.edu>
* ChangeLog, FromCVS.sh, autoconf/libgcrypt.m4,
- autoconf/libgnutls.m4: add m4 macros for libgcrypt and libgnutls to
- the repository, so that FromCVS can be run to regenerate
- configure.in, even on systems without gnutls.
+ autoconf/libgnutls.m4: add m4 macros for libgcrypt and libgnutls
+ to the repository, so that FromCVS can be run to regenerate
+ configure.in, even on systems without gnutls.
2002-04-20 Saturday 09:55 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Makefile.am: correct a problem uncovered by sourceforge's
- compile farm
+ compile farm
2002-04-20 Saturday 09:27 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1166,12 +1212,12 @@
2002-04-20 Saturday 09:12 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: LicqClient.c, mboxClient.c: move msgs=-1 assignment on
- failure to the common openMailbox()
+ failure to the common openMailbox()
2002-04-20 Saturday 08:53 UTC -- Neil Spring <nspring at cs.washington.edu>
* ChangeLog, configure.in, wmbiff/Client.h: update meta-information
- for prerelease 5
+ for prerelease 5
2002-04-20 Saturday 08:51 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1184,38 +1230,39 @@
2002-04-20 Saturday 08:12 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: sample.wmbiffrc, wmbiffrc.5.in: document back-tick
- expansion, deprecate mbox style without mbox: prefix
+ expansion, deprecate mbox style without mbox: prefix
2002-04-20 Saturday 07:54 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Client.h, LicqClient.c, ShellClient.c, mboxClient.c:
- oops (indent)
+ oops (indent)
2002-04-20 Saturday 07:53 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: LicqClient.c, mboxClient.c: refactor mailbox stat()'ting
- to reduce duplicated code and supprort backticks.
+ to reduce duplicated code and supprort backticks.
2002-04-20 Saturday 07:52 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/ShellClient.c: refactor command execution code to support
- backtick foo expansion
+ backtick foo expansion
2002-04-20 Saturday 07:50 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Makefile.am, test_wmbiff.c: add tests for bbacktick
- expansion
+ expansion
2002-04-20 Saturday 07:49 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Client.h: ctime has become useless; new prototypes to
- handle backtick
+ handle backtick
2002-04-16 Tuesday 07:37 UTC -- Neil Spring <nspring at cs.washington.edu>
* ChangeLog, wmbiff/Client.h, wmbiff/Imap4Client.c,
- wmbiff/LicqClient.c, wmbiff/Pop3Client.c, wmbiff/mboxClient.c,
- wmbiff/passwordMgr.c, wmbiff/wmbiff.c: remove vestigial pc->open()
+ wmbiff/LicqClient.c, wmbiff/Pop3Client.c, wmbiff/mboxClient.c,
+ wmbiff/passwordMgr.c, wmbiff/wmbiff.c: remove vestigial
+ pc->open()
2002-04-16 Tuesday 07:08 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1228,8 +1275,8 @@
2002-04-15 Monday 21:19 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmgeneral/: Makefile.am, list.c, list.h, misc.c, misc.h,
- wmgeneral.c, wmgeneral.h: run make indent; also tolerate standard
- geometry string (dumping the dimensions provided)
+ wmgeneral.c, wmgeneral.h: run make indent; also tolerate standard
+ geometry string (dumping the dimensions provided)
2002-04-15 Monday 21:06 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1238,8 +1285,8 @@
2002-04-15 Monday 08:15 UTC -- Neil Spring <nspring at cs.washington.edu>
* ChangeLog, Makefile.am, configure.in, wmbiff/Makefile.am,
- autoconf/Makefile.am: try to make the distcheck target work
- correctly. voodoo.
+ autoconf/Makefile.am: try to make the distcheck target work
+ correctly. voodoo.
2002-04-15 Monday 08:14 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1252,7 +1299,7 @@
2002-04-15 Monday 02:10 UTC -- Neil Spring <nspring at cs.washington.edu>
* configure.in: chmod 0444 wmbiffrc.5 to remind me not to try to
- edit it.
+ edit it.
2002-04-15 Monday 02:09 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1269,13 +1316,13 @@
2002-04-15 Monday 01:47 UTC -- Neil Spring <nspring at cs.washington.edu>
* ChangeLog, configure.in, wmbiff/wmbiff-master-contrast.xpm:
- 0.4.0pre4 - finger support, text from shell support, minor code
- reorganization
+ 0.4.0pre4 - finger support, text from shell support, minor code
+ reorganization
2002-04-15 Monday 01:38 UTC -- Neil Spring <nspring at cs.washington.edu>
* AUTHORS, README: add Andelko Horvat to the list of contributors,
- remove author list from README
+ remove author list from README
2002-04-15 Monday 01:30 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1284,18 +1331,18 @@
2002-04-15 Monday 01:30 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Client.h: TextStatus to hold a three-character status
- message
+ message
2002-04-15 Monday 01:30 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/wmbiff.c: support TextString as status; factor
- blitMsgCounters as displayMsgCounters was starting to get ugly, add
- finger recipe to use ShellClient instead of a separate module
+ blitMsgCounters as displayMsgCounters was starting to get ugly,
+ add finger recipe to use ShellClient instead of a separate module
2002-04-15 Monday 01:26 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/passwordMgr.c: use chomp to remove the newline from
- ssh-askpass output
+ ssh-askpass output
2002-04-15 Monday 01:26 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1304,8 +1351,8 @@
2002-04-15 Monday 01:26 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/ShellClient.c: return sigchld to default hander before
- using popen; handle text input. Much complexity, I hope it's worth
- it.
+ using popen; handle text input. Much complexity, I hope it's
+ worth it.
2002-04-15 Monday 01:25 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1314,17 +1361,17 @@
2002-04-15 Monday 01:24 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Makefile.am: derive wmbiff-master-contrast.xpm from
- wmbiff-master-led.xpm
+ wmbiff-master-led.xpm
2002-04-12 Friday 05:54 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/socket.c: extra debugging messages, to be in-line with our
- -debug to stdout philosophy
+ -debug to stdout philosophy
2002-04-11 Thursday 21:39 UTC -- Jordi Mallach <jordi at sindominio.net>
* autoconf/: install-sh, missing, mkinstalldirs: Shouldn't be in
- CVS...
+ CVS...
2002-04-11 Thursday 18:24 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1337,41 +1384,41 @@
2002-04-09 Tuesday 07:52 UTC -- Neil Spring <nspring at cs.washington.edu>
* ChangeLog, configure.in: bump version to 0.4.0pre3 - permissions
- checking for .wmbiffrc added.
+ checking for .wmbiffrc added.
2002-04-09 Tuesday 07:47 UTC -- Neil Spring <nspring at cs.washington.edu>
* Makefile.am: try to tell the difference between running make dist
- with cvs and missing cvs2cl (an error), and running make dist
- without cvs (which should be ok).
+ with cvs and missing cvs2cl (an error), and running make dist
+ without cvs (which should be ok).
2002-04-09 Tuesday 07:45 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: LicqClient.c, maildirClient.c, mboxClient.c: some
- explicit casts to make compiling on non-linux a bit more
- warning-free
+ explicit casts to make compiling on non-linux a bit more
+ warning-free
2002-04-09 Tuesday 07:44 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/wmbiff.c: permissions checking for .wmbiffrc (if it
- exists), some minor cleanup associated with this.
+ exists), some minor cleanup associated with this.
2002-04-09 Tuesday 07:43 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Makefile.am: _DATA files don't get distributed, add the
- skins into extra_dist. automake can be confusing
+ skins into extra_dist. automake can be confusing
2002-04-08 Monday 09:35 UTC -- Neil Spring <nspring at cs.washington.edu>
* configure.in, wmbiff/wmbiffrc.5, wmbiff/wmbiffrc.5.in:
- automatically generate wmbiffrc.5 based on the results of
- configure, so that the configure-time chosen defaults are
- accurately shown
+ automatically generate wmbiffrc.5 based on the results of
+ configure, so that the configure-time chosen defaults are
+ accurately shown
2002-04-07 Sunday 19:30 UTC -- Neil Spring <nspring at cs.washington.edu>
* configure.in: don't try to configure gnutls if libz or libgdbm
- aren't installed
+ aren't installed
2002-04-07 Sunday 19:30 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1380,14 +1427,14 @@
2002-04-07 Sunday 05:08 UTC -- Neil Spring <nspring at cs.washington.edu>
* COPYING, ChangeLog, FromCVS.sh, INSTALL, Makefile.am,
- configure.in, autoconf/acconfig.h, autoconf/install-sh,
- autoconf/missing, autoconf/mkinstalldirs, maint/changelog-header,
- wmbiff/Client.h, wmbiff/Imap4Client.c, wmbiff/LicqClient.c,
- wmbiff/Makefile, wmbiff/Makefile.am, wmbiff/Pop3Client.c,
- wmbiff/charutil.h, wmbiff/maildirClient.c, wmbiff/mboxClient.c,
- wmbiff/tlsComm.c, wmbiff/wmbiff.c, wmgeneral/Makefile.am,
- wmgeneral/wmgeneral.c: use automake / autoconf; after checkout run
- ./FromCVS.sh
+ configure.in, autoconf/acconfig.h, autoconf/install-sh,
+ autoconf/missing, autoconf/mkinstalldirs, maint/changelog-header,
+ wmbiff/Client.h, wmbiff/Imap4Client.c, wmbiff/LicqClient.c,
+ wmbiff/Makefile, wmbiff/Makefile.am, wmbiff/Pop3Client.c,
+ wmbiff/charutil.h, wmbiff/maildirClient.c, wmbiff/mboxClient.c,
+ wmbiff/tlsComm.c, wmbiff/wmbiff.c, wmgeneral/Makefile.am,
+ wmgeneral/wmgeneral.c: use automake / autoconf; after checkout
+ run ./FromCVS.sh
2002-04-07 Sunday 03:23 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1396,13 +1443,13 @@
2002-04-05 Friday 19:44 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/wmbiff-master-contrast.xpm: a first cut higher-contrast
- skin
+ skin
2002-04-05 Friday 19:43 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Makefile, sample.wmbiffrc, test-make.sh, wmbiff.c:
- askpass - invoke ssh-askpass to fill in passwords for IMAP servers;
- skin - dynamically load an .xpm background
+ askpass - invoke ssh-askpass to fill in passwords for IMAP
+ servers; skin - dynamically load an .xpm background
2002-04-05 Friday 19:42 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1415,14 +1462,14 @@
2002-04-05 Friday 19:02 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/passwordMgr.c: askpass having a space in it is an INFO,
- not an ERR.
+ not an ERR.
2002-04-04 Thursday 08:51 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Client.h, Imap4Client.c, Makefile, Pop3Client.c,
- passwordMgr.c, passwordMgr.h, sample.wmbiffrc, test-make.sh:
- interactive password prompting support for imap - leave password in
- the : format blank to use
+ passwordMgr.c, passwordMgr.h, sample.wmbiffrc, test-make.sh:
+ interactive password prompting support for imap - leave password
+ in the : format blank to use
2002-03-26 Tuesday 16:30 UTC -- Jordi Mallach <jordi at sindominio.net>
@@ -1443,8 +1490,9 @@
2002-03-12 Tuesday 23:53 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Client.h, Imap4Client.c, Pop3Client.c, ShellClient.c,
- tlsComm.c: fixed misunderstanding of the use of ## in macros with
- strings - the compiler does the concatenation, not the preprocessor
+ tlsComm.c: fixed misunderstanding of the use of ## in macros with
+ strings - the compiler does the concatenation, not the
+ preprocessor
2002-03-11 Monday 00:11 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1453,8 +1501,8 @@
2002-03-09 Saturday 08:50 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/ShellClient.c: debug messages cleanup; start handling
- pclose errors; remove open() function pointer assignment; #include
- fix
+ pclose errors; remove open() function pointer assignment;
+ #include fix
2002-03-09 Saturday 08:03 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1483,7 +1531,7 @@
2002-03-06 Wednesday 07:59 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/wmbiff.c: rename in Read_Config_File for more 'index'
- purging
+ purging
2002-03-06 Wednesday 07:44 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1492,13 +1540,14 @@
2002-03-06 Wednesday 07:15 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Client.h, Makefile, ShellClient.c, mboxClient.c,
- sample.wmbiffrc, test-wmbiffrc.shell, wmbiff.1, wmbiff.c,
- wmbiffrc.5: Draft shell command and gnomeicu support from Beno�t
- Rouits with minor modifications 1) implement gicu using the shell
- module rather than as a separate module, 2) edit Ben's shell format
- to have extra colons for extensibility, 3) add some extra error
- checking in the shell method. I also added a test wmbiffrc that
- can be used to verify that the gicu and shell methods "work".
+ sample.wmbiffrc, test-wmbiffrc.shell, wmbiff.1, wmbiff.c,
+ wmbiffrc.5: Draft shell command and gnomeicu support from Beno�t
+ Rouits with minor modifications 1) implement gicu using the shell
+ module rather than as a separate module, 2) edit Ben's shell
+ format to have extra colons for extensibility, 3) add some extra
+ error checking in the shell method. I also added a test wmbiffrc
+ that can be used to verify that the gicu and shell methods
+ "work".
2002-03-05 Tuesday 05:02 UTC -- Dwayne C. Litzenberger <dlitz at dlitz.net>
@@ -1511,13 +1560,13 @@
2002-03-02 Saturday 23:25 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Imap4Client.c, Makefile, wmbiff.c: a little -Wshadow and
- -Wcast-qual cleanup (or, eliminate the use of 'index' as a variable
- name)
+ -Wcast-qual cleanup (or, eliminate the use of 'index' as a
+ variable name)
2002-03-02 Saturday 22:38 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Client.h: add preprocessor define to handle portability of
- __attribute__ tag to non-gcc compilers (untested)
+ __attribute__ tag to non-gcc compilers (untested)
2002-03-02 Saturday 06:42 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1526,7 +1575,7 @@
2002-03-02 Saturday 06:41 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Pop3Client.c, Imap4Client.c: minor reorganization of
- gcrypt-needing authentication schemes
+ gcrypt-needing authentication schemes
2002-03-02 Saturday 06:39 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1539,12 +1588,12 @@
2002-03-02 Saturday 06:31 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Makefile: rearrange which compiler warnings are implied by
- DEBUG
+ DEBUG
2002-03-02 Saturday 05:58 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Client.h: use off_t instead of size_t in Licq and Maildir
- for file sizes from stat()
+ for file sizes from stat()
2002-03-02 Saturday 05:50 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1553,7 +1602,7 @@
2002-03-01 Friday 11:58 UTC -- Jordi Mallach <jordi at sindominio.net>
* wmbiff/wmbiff.c: Added -debug to help text. Removed Gennady's
- mail address and added our devel list.
+ mail address and added our devel list.
2002-03-01 Friday 11:28 UTC -- Jordi Mallach <jordi at sindominio.net>
@@ -1562,12 +1611,12 @@
2002-03-01 Friday 08:41 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Client.h, Imap4Client.c, LicqClient.c, Makefile,
- Pop3Client.c, maildirClient.c, mboxClient.c, tlsComm.c, tlsComm.h,
- wmbiff.1, wmbiff.c, wmbiffrc.5: Replaced DEBUG_x preprocessor
- defines with a -debug option and debug configuration keyword.
- Replaced most debugging messages with a DM (debug message) macro.
- Removed gnutls version 0.2.x support. Added troubleshooting
- section to man page.
+ Pop3Client.c, maildirClient.c, mboxClient.c, tlsComm.c,
+ tlsComm.h, wmbiff.1, wmbiff.c, wmbiffrc.5: Replaced DEBUG_x
+ preprocessor defines with a -debug option and debug configuration
+ keyword. Replaced most debugging messages with a DM (debug
+ message) macro. Removed gnutls version 0.2.x support. Added
+ troubleshooting section to man page.
2002-02-03 Sunday 22:48 UTC -- Jordi Mallach <jordi at sindominio.net>
@@ -1580,13 +1629,13 @@
2002-02-02 Saturday 18:04 UTC -- Jordi Mallach <jordi at sindominio.net>
* wmbiff/: Client.h, Imap4Client.c, Makefile, Pop3Client.c,
- charutil.h: Makefile fixes from Simon L. Nielsen, which help
- building wmbiff in FreeBSD. Fixed the previous IMAP regex patch.
+ charutil.h: Makefile fixes from Simon L. Nielsen, which help
+ building wmbiff in FreeBSD. Fixed the previous IMAP regex patch.
2002-01-27 Sunday 20:20 UTC -- Jordi Mallach <jordi at sindominio.net>
* ChangeLog, maint/changelog.sed, maint/prerelease.sh: Some fixes
- for the maint scripts.
+ for the maint scripts.
2002-01-27 Sunday 19:59 UTC -- Jordi Mallach <jordi at sindominio.net>
@@ -1603,9 +1652,9 @@
2002-01-27 Sunday 12:46 UTC -- Jordi Mallach <jordi at sindominio.net>
* README, wmbiff/Imap4Client.c, wmbiff/Makefile, wmbiff/wmbiffrc.5:
- Alternate regex for imap/imaps which allows "@" in passwords. Fix
- to correctly handle the auth list in imap. Patch from David Smith
- <davidsmith at acm.org>.
+ Alternate regex for imap/imaps which allows "@" in passwords.
+ Fix to correctly handle the auth list in imap. Patch from David
+ Smith <davidsmith at acm.org>.
2002-01-14 Monday 01:51 UTC -- Jordi Mallach <jordi at sindominio.net>
@@ -1618,7 +1667,7 @@
2002-01-12 Saturday 19:18 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Imap4Client.c: quote patch from Nick Mitchell, ref debian
- #128863
+ #128863
2002-01-12 Saturday 06:17 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1631,7 +1680,7 @@
2002-01-12 Saturday 05:30 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Makefile, charutil.c, tlsComm.c: update for the
- interface change in gnutls 0.3.0
+ interface change in gnutls 0.3.0
2001-11-23 Friday 15:57 UTC -- Jordi Mallach <jordi at sindominio.net>
@@ -1648,7 +1697,7 @@
2001-11-16 Friday 07:11 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Imap4Client.c, Pop3Client.c, charutil.c: regexes limit
- password and username to 32 characters
+ password and username to 32 characters
2001-11-16 Friday 06:08 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1657,25 +1706,25 @@
2001-11-16 Friday 01:13 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Client.h, Imap4Client.c, Makefile, Pop3Client.c,
- charutil.c: rewrite of authentication code to a) allow users to
- specify authentication type, b) fall back to other authentication
- methods when hash-based authentication fails (because not everybody
- uses the cleartext password file) c) fix debug messages
+ charutil.c: rewrite of authentication code to a) allow users to
+ specify authentication type, b) fall back to other authentication
+ methods when hash-based authentication fails (because not
+ everybody uses the cleartext password file) c) fix debug messages
2001-11-16 Friday 00:40 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/charutil.h: regex helpers common to pop3 and imap4 clients
- extracted and moved here
+ extracted and moved here
2001-11-16 Friday 00:40 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: tlsComm.c, tlsComm.h: blacklist and debugging updates
- for gnutls 0.2.10 and DM macro
+ for gnutls 0.2.10 and DM macro
2001-11-16 Friday 00:39 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/wmbiffrc.5: authentication method list, reduced
- indentation to fit screen better
+ indentation to fit screen better
2001-11-16 Friday 00:38 UTC -- Neil Spring <nspring at cs.washington.edu>
@@ -1688,13 +1737,13 @@
2001-11-02 Friday 08:53 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/: Imap4Client.c, wmbiff.c, wmbiffrc.5: Prefer "imaps"
- instead of "sslimap" (sslimap is still supported, but imaps is
- documented, and a better name).
+ instead of "sslimap" (sslimap is still supported, but imaps is
+ documented, and a better name).
2001-11-02 Friday 08:48 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/tlsComm.c: Small debugging message to help if a connection
- ends unexpectedly.
+ ends unexpectedly.
2001-10-29 Monday 13:57 UTC -- Jordi Mallach <jordi at sindominio.net>
@@ -1707,12 +1756,12 @@
2001-10-28 Sunday 23:32 UTC -- Jordi Mallach <jordi at sindominio.net>
* ChangeLog, README, wmbiff/Makefile, wmbiff/sample.wmbiffrc:
- Preparation for 0.3.3. Documentation updates.
+ Preparation for 0.3.3. Documentation updates.
2001-10-28 Sunday 22:22 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/wmbiff.c: Bugfix: initialize libgcrypt properly before
- cram-md5 (or probably apop) authentication.
+ cram-md5 (or probably apop) authentication.
2001-10-24 Wednesday 15:35 UTC -- Jordi Mallach <jordi at sindominio.net>
@@ -1721,7 +1770,7 @@
2001-10-23 Tuesday 21:14 UTC -- Neil Spring <nspring at cs.washington.edu>
* wmbiff/Imap4Client.c: error check just in case sighup patch is
- applied
+ applied
2001-10-23 Tuesday 18:35 UTC -- Jordi Mallach <jordi at sindominio.net>
@@ -1734,82 +1783,83 @@
2001-10-05 Friday 16:10 UTC -- Jordi Mallach <jordi at sindominio.net>
* wmbiff/Makefile: Changed order of additions to LIBS and
- EXTRAFLAGS, removed extra WMBIFF_VERSION definition.
+ EXTRAFLAGS, removed extra WMBIFF_VERSION definition.
2001-10-04 Thursday 09:50 UTC -- Jordi Mallach <jordi at sindominio.net>
* README, wmbiff/Client.h, wmbiff/Imap4Client.c,
- wmbiff/LicqClient.c, wmbiff/Makefile, wmbiff/Pop3Client.c,
- wmbiff/charutil.c, wmbiff/charutil.h, wmbiff/maildirClient.c,
- wmbiff/mboxClient.c, wmbiff/socket.c, wmbiff/tlsComm.c,
- wmbiff/tlsComm.h, wmbiff/wmbiff.1, wmbiff/wmbiff.c,
- wmbiff/wmbiffrc.5: * Big patch from Neil Spring which adds lots of
- crypto support to WMBiff. * WMBiff can now speak IMAP over TLS and
- CRAM-MD5, and APOP using libgcrypt. * Known problems: - gnutls
- is being developed still, so it may have security related bugs.
- - A bug in gnutls (a too-small buffer) may cause problems in
- the parsing of openssl certificates. This should be fixed by gnutls
- soon, hopefully. Added error messages if this bug is tickled.
- If you've got problems with IMAP SSL, please try upgrading
- gnutls. If the problem persists, let us know. - IMAP has
- totally been rewritten, so bugs may crop up. - Pop3 hasn't been
- rewritten to use the TLS primitives, though it probably could
- be if someone wanted to. * There's a new interface for reading and
- writing to the socket in tlsComm.[ch]. This makes the IMAP code
- somewhat independent of whether ssl is used, and provides nicer
- primitives to help skip 'informational' messages. * WITH_TLS and
- WITH_GCRYPT are on-by-default in the Makefile. TLS applies to
- encryption, GCRYPT to cram-md5 and apop authentication. Since
- gnutls depends on libgcrypt anyway, these probably don't need to be
- independent. Some compile warnings may be generated when these
- are disabled. * Added code to optionally include dmalloc.h and
- link -ldmalloc. This doesn't do anything at the moment, but
- shouldn't hurt. It's off-by-default. * IMAP connections are now
- persistent. persistent. This is to cut down on the need to
- re-negotiate an SSL connection every time you want to check mail.
- It tries to use just one connection per
- (server/username/password/port number), which means multiple
- mailboxes need only one connection. * There are a handful of
- lclint (http://lclint.cs.virginia.edu) annotations in
- tlsComm.[ch]. These should also not hurt anyone, and are meant to
- keep the signal to noise ratio of lclint high. * The rewritten
- IMAP code uses the GNU regex library to handle the configuration
- line. I think its clearer than the cascading strtok() solution,
- but the regex might not be perfect. * Removed an unnecessary
- "inline" keyword from charutil.h. * Added a TODO document with the
- bits that are missing from the picture. * Please bow in awe at
- NAKAYAMA Takao, Jay T. Francis and specially Neil Spring for all
- of this.
+ wmbiff/LicqClient.c, wmbiff/Makefile, wmbiff/Pop3Client.c,
+ wmbiff/charutil.c, wmbiff/charutil.h, wmbiff/maildirClient.c,
+ wmbiff/mboxClient.c, wmbiff/socket.c, wmbiff/tlsComm.c,
+ wmbiff/tlsComm.h, wmbiff/wmbiff.1, wmbiff/wmbiff.c,
+ wmbiff/wmbiffrc.5: * Big patch from Neil Spring which adds lots
+ of crypto support to WMBiff. * WMBiff can now speak IMAP over
+ TLS and CRAM-MD5, and APOP using libgcrypt. * Known problems:
+ - gnutls is being developed still, so it may have security
+ related bugs. - A bug in gnutls (a too-small buffer) may cause
+ problems in the parsing of openssl certificates. This should
+ be fixed by gnutls soon, hopefully. Added error messages if
+ this bug is tickled. If you've got problems with IMAP SSL,
+ please try upgrading gnutls. If the problem persists, let us
+ know. - IMAP has totally been rewritten, so bugs may crop up.
+ - Pop3 hasn't been rewritten to use the TLS primitives, though
+ it probably could be if someone wanted to. * There's a new
+ interface for reading and writing to the socket in
+ tlsComm.[ch]. This makes the IMAP code somewhat independent of
+ whether ssl is used, and provides nicer primitives to help skip
+ 'informational' messages. * WITH_TLS and WITH_GCRYPT are
+ on-by-default in the Makefile. TLS applies to encryption,
+ GCRYPT to cram-md5 and apop authentication. Since gnutls
+ depends on libgcrypt anyway, these probably don't need to be
+ independent. Some compile warnings may be generated when these
+ are disabled. * Added code to optionally include dmalloc.h
+ and link -ldmalloc. This doesn't do anything at the moment, but
+ shouldn't hurt. It's off-by-default. * IMAP connections are now
+ persistent. persistent. This is to cut down on the need to
+ re-negotiate an SSL connection every time you want to check
+ mail. It tries to use just one connection per
+ (server/username/password/port number), which means multiple
+ mailboxes need only one connection. * There are a handful of
+ lclint (http://lclint.cs.virginia.edu) annotations in
+ tlsComm.[ch]. These should also not hurt anyone, and are meant to
+ keep the signal to noise ratio of lclint high. * The rewritten
+ IMAP code uses the GNU regex library to handle the
+ configuration line. I think its clearer than the cascading
+ strtok() solution, but the regex might not be perfect. *
+ Removed an unnecessary "inline" keyword from charutil.h. * Added
+ a TODO document with the bits that are missing from the picture.
+ * Please bow in awe at NAKAYAMA Takao, Jay T. Francis and
+ specially Neil Spring for all of this.
2001-10-04 Thursday 09:21 UTC -- Jordi Mallach <jordi at sindominio.net>
* wmbiff/ApopClient.c: Removed unneeded Apop support code, now
- integrated in Neil and Jay's patch.
+ integrated in Neil and Jay's patch.
2001-10-04 Thursday 09:00 UTC -- Jordi Mallach <jordi at sindominio.net>
* maint/changelog.sed: Added my other SF account, which I intend to
- use now.
+ use now.
2001-10-04 Thursday 08:54 UTC -- Jordi Mallach <jordi at sindominio.net>
* ChangeLog, README, wmbiff/Client.h, wmbiff/Makefile,
- wmbiff/sample.wmbiffrc, wmbiff/wmbiff.1, wmbiff/wmbiff.c,
- wmbiff/wmbiffrc.5: Backed out hoehoe's patch, preparing to apply
- Neil's.
+ wmbiff/sample.wmbiffrc, wmbiff/wmbiff.1, wmbiff/wmbiff.c,
+ wmbiff/wmbiffrc.5: Backed out hoehoe's patch, preparing to apply
+ Neil's.
2001-09-24 Monday 11:58 UTC -- Jordi Mallach <jordi at sindominio.net>
* ChangeLog, 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.
+ 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.
+ cleaner ChangeLogs.
2001-06-24 Sunday 18:17 UTC -- Jordi Mallach <jordi at sindominio.net>
@@ -1818,7 +1868,7 @@
2001-06-24 Sunday 18:08 UTC -- Jordi Mallach <jordi at sindominio.net>
* ChangeLog, README: Removed duplicate entry for Vladimir Popov in
- README.
+ README.
2001-06-23 Saturday 00:09 UTC -- Jordi Mallach <jordi at sindominio.net>
@@ -1827,8 +1877,8 @@
2001-06-23 Saturday 00:07 UTC -- Jordi Mallach <jordi at sindominio.net>
* ChangeLog, maint/changelog.sed, maint/prerelease.sh: Renamed
- CHANGES to ChangeLog and RELEASE-NOTES to NEWS, modified release
- scripts accordingly. Added Mark to the sed file.
+ CHANGES to ChangeLog and RELEASE-NOTES to NEWS, modified release
+ scripts accordingly. Added Mark to the sed file.
2001-06-22 Friday 23:55 UTC -- Jordi Mallach <jordi at sindominio.net>
@@ -1837,42 +1887,42 @@
2001-06-19 Tuesday 03:52 UTC -- Dwayne C. Litzenberger <dlitz at dlitz.net>
* CHANGES, maint/prerelease.sh: * Whoops! Messed up CVS expansion
- in maint/prerelease.sh. Fixed it. * Also changed
- maint/prerelease.sh a bit.
+ in maint/prerelease.sh. Fixed it. * Also changed
+ maint/prerelease.sh a bit.
2001-06-19 Tuesday 03:38 UTC -- Dwayne C. Litzenberger <dlitz at dlitz.net>
* CHANGES, ChangeLog, README, RELEASE-NOTES, maint/changelog.sed,
- maint/prerelease.sh, wmbiff/Client.h, wmbiff/Imap4Client.c,
- wmbiff/LicqClient.c, wmbiff/Makefile, wmbiff/Pop3Client.c,
- wmbiff/charutil.c, wmbiff/charutil.h, wmbiff/maildirClient.c,
- wmbiff/mboxClient.c, wmbiff/sample.wmbiffrc, wmbiff/socket.c,
- wmbiff/wmbiff.1, wmbiff/wmbiff.c, wmbiff/wmbiffrc.5: * Another big
- patch that mucks with everything. I probably deserve to be
- flamed for this practice. Feel free... :-) * Added
- maint/prerelease.sh script. Run it before making any releases. *
- Added maint/changelog.sed. Add your SourceForge userid here. *
- Moved ChangeLog to RELEASE-NOTES (see below). * Added a new file,
- CHANGES (created by maint/prerelease.sh) that tabulates all the
- CVS changes. * Added "distclean" to wmbiff/Makefile. * Added CVS
- Id$ to all the files in wmbiff/ . * I reformatted ths changelog,
- again. I hope this is the last time I need to do this. The CVS
- logs should be used for all changes, and this file should by
- updated for user-visible changes only, from now on. (Dwayne C.
- Litzenberger) * Updated the README to reflect that Gennady
- Belyakov died right after releasing wmBiff 0.2. May your soul
- rest in peace, Gennady. (Dwayne C. Litzenberger)
+ maint/prerelease.sh, wmbiff/Client.h, wmbiff/Imap4Client.c,
+ wmbiff/LicqClient.c, wmbiff/Makefile, wmbiff/Pop3Client.c,
+ wmbiff/charutil.c, wmbiff/charutil.h, wmbiff/maildirClient.c,
+ wmbiff/mboxClient.c, wmbiff/sample.wmbiffrc, wmbiff/socket.c,
+ wmbiff/wmbiff.1, wmbiff/wmbiff.c, wmbiff/wmbiffrc.5: * Another
+ big patch that mucks with everything. I probably deserve to be
+ flamed for this practice. Feel free... :-) * Added
+ maint/prerelease.sh script. Run it before making any releases.
+ * Added maint/changelog.sed. Add your SourceForge userid here.
+ * Moved ChangeLog to RELEASE-NOTES (see below). * Added a new
+ file, CHANGES (created by maint/prerelease.sh) that tabulates
+ all the CVS changes. * Added "distclean" to wmbiff/Makefile. *
+ Added CVS Id$ to all the files in wmbiff/ . * I reformatted ths
+ changelog, again. I hope this is the last time I need to do
+ this. The CVS logs should be used for all changes, and this file
+ should by updated for user-visible changes only, from now on.
+ (Dwayne C. Litzenberger) * Updated the README to reflect that
+ Gennady Belyakov died right after releasing wmBiff 0.2. May
+ your soul rest in peace, Gennady. (Dwayne C. Litzenberger)
2001-06-16 Saturday 01:02 UTC -- Jordi Mallach <jordi at sindominio.net>
* ChangeLog, wmbiff/Makefile, wmbiff/sample.wmbiffrc,
- wmbiff/wmbiff.c: An FHS fix for wmbiff.c and use $(CC) in the
- Makefile
+ wmbiff/wmbiff.c: An FHS fix for wmbiff.c and use $(CC) in the
+ Makefile
2001-05-17 Thursday 04:22 UTC -- Dwayne C. Litzenberger <dlitz at dlitz.net>
* ChangeLog, wmbiff/Makefile, wmbiff/charutil.c: Committing Mark
- Hurley's patch
+ Hurley's patch
2001-05-16 Wednesday 10:48 UTC -- Jordi Mallach <jordi at sindominio.net>
@@ -1881,39 +1931,40 @@
2001-05-11 Friday 15:04 UTC -- Jordi Mallach <jordi at sindominio.net>
* ChangeLog, wmbiff/Imap4Client.c, wmbiff/Makefile,
- wmbiff/charutil.c, wmbiff/charutil.h, wmbiff/wmbiff.c: Mark's
- wmbiffrc parsing fix, small Makefile changes and bump version to
- 0.3.0.
+ wmbiff/charutil.c, wmbiff/charutil.h, wmbiff/wmbiff.c: Mark's
+ wmbiffrc parsing fix, small Makefile changes and bump version to
+ 0.3.0.
2001-05-11 Friday 14:49 UTC -- Jordi Mallach <jordi at sindominio.net>
* wmbiff/Makefile: Uncommitted stuff to deal with the removal of
- the xmp link
+ the xmp link
2001-05-04 Friday 11:01 UTC -- Jordi Mallach <jordi at sindominio.net>
* ChangeLog, wmbiff/Makefile: Updated Changelog and Makefile for
- 0.2r.
+ 0.2r.
2001-05-01 Tuesday 16:11 UTC -- Jordi Mallach <jordi at sindominio.net>
* README.licq, ChangeLog, README, wmgeneral/list.c,
- wmgeneral/list.h, wmgeneral/misc.c, wmgeneral/misc.h,
- wmgeneral/wmgeneral.h, wmbiff/socket.c, wmgeneral/wmgeneral.c,
- wmbiff/Imap4Client.c, wmbiff/Makefile, wmbiff/mboxClient.c,
- wmbiff/sample.wmbiffrc, wmbiff/wmbiff.1, wmbiff/wmbiff.c,
- wmbiff/wmbiff-master-led.xpm, wmbiff/Client.h, wmbiff/LicqClient.c,
- wmbiff/Pop3Client.c, wmbiff/maildirClient.c, wmbiff/wmbiffrc.5:
- Initial revision
+ wmgeneral/list.h, wmgeneral/misc.c, wmgeneral/misc.h,
+ wmgeneral/wmgeneral.h, wmbiff/socket.c, wmgeneral/wmgeneral.c,
+ wmbiff/Imap4Client.c, wmbiff/Makefile, wmbiff/mboxClient.c,
+ wmbiff/sample.wmbiffrc, wmbiff/wmbiff.1, wmbiff/wmbiff.c,
+ wmbiff/wmbiff-master-led.xpm, wmbiff/Client.h,
+ wmbiff/LicqClient.c, wmbiff/Pop3Client.c, wmbiff/maildirClient.c,
+ wmbiff/wmbiffrc.5: Initial import to SourceForge, version
+ 0.2q1+Debian
2001-05-01 Tuesday 16:11 UTC -- Jordi Mallach <jordi at sindominio.net>
* README.licq, ChangeLog, README, wmgeneral/list.c,
- wmgeneral/list.h, wmgeneral/misc.c, wmgeneral/misc.h,
- wmgeneral/wmgeneral.h, wmbiff/socket.c, wmgeneral/wmgeneral.c,
- wmbiff/Imap4Client.c, wmbiff/Makefile, wmbiff/mboxClient.c,
- wmbiff/sample.wmbiffrc, wmbiff/wmbiff.1, wmbiff/wmbiff.c,
- wmbiff/wmbiff-master-led.xpm, wmbiff/Client.h, wmbiff/LicqClient.c,
- wmbiff/Pop3Client.c, wmbiff/maildirClient.c, wmbiff/wmbiffrc.5:
- Initial import to SourceForge, version 0.2q1+Debian
+ wmgeneral/list.h, wmgeneral/misc.c, wmgeneral/misc.h,
+ wmgeneral/wmgeneral.h, wmbiff/socket.c, wmgeneral/wmgeneral.c,
+ wmbiff/Imap4Client.c, wmbiff/Makefile, wmbiff/mboxClient.c,
+ wmbiff/sample.wmbiffrc, wmbiff/wmbiff.1, wmbiff/wmbiff.c,
+ wmbiff/wmbiff-master-led.xpm, wmbiff/Client.h,
+ wmbiff/LicqClient.c, wmbiff/Pop3Client.c, wmbiff/maildirClient.c,
+ wmbiff/wmbiffrc.5: Initial revision
diff --git a/Makefile.in b/Makefile.in
index 9ceea23..510ccab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -13,80 +13,74 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+
ACLOCAL = @ACLOCAL@ $(ACLOCAL_FLAGS)
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
CVS2CL = @CVS2CL@
-CYGPATH_W = @CYGPATH_W@
DEFAULT_ASKPASS = @DEFAULT_ASKPASS@
-DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
GCRYPT_MAN_STATUS = @GCRYPT_MAN_STATUS@
GNUTLS_COMMON_O = @GNUTLS_COMMON_O@
GNUTLS_MAN_STATUS = @GNUTLS_MAN_STATUS@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
SKINDIR = @SKINDIR@
STRIP = @STRIP@
VERSION = @VERSION@
@@ -94,33 +88,9 @@ X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
-am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
SUBDIRS = wmgeneral wmbiff autoconf scripts
EXTRA_DIST = ChangeLog FAQ README.licq TODO
@@ -145,14 +115,13 @@ CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
DIST_SOURCES =
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
- ps-recursive install-info-recursive uninstall-info-recursive \
- all-recursive install-data-recursive install-exec-recursive \
- installdirs-recursive install-recursive uninstall-recursive \
- check-recursive installcheck-recursive
-DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
- COPYING ChangeLog INSTALL Makefile.am NEWS TODO aclocal.m4 \
- config.h.in configure configure.ac
+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+ uninstall-info-recursive all-recursive install-data-recursive \
+ install-exec-recursive installdirs-recursive install-recursive \
+ uninstall-recursive check-recursive installcheck-recursive
+DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
+ Makefile.in NEWS TODO aclocal.m4 config.h.in configure \
+ configure.ac
DIST_SUBDIRS = $(SUBDIRS)
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -247,17 +216,10 @@ tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
ETAGS = etags
ETAGSFLAGS =
-CTAGS = ctags
-CTAGSFLAGS =
-
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -273,15 +235,9 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- if (etags --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- else \
- include_option=--include; \
- fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
@@ -294,28 +250,13 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = .
@@ -327,20 +268,13 @@ am__remove_distdir = \
&& rm -fr $(distdir); }; }
GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
$(mkinstalldirs) $(distdir)/wmbiff
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @list='$(DISTFILES)'; for file in $$list; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -393,13 +327,12 @@ distcheck: dist
$(am__remove_distdir)
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
+ mkdir $(distdir)/=build
+ mkdir $(distdir)/=inst
chmod a-w $(distdir)
- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && cd $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
+ && cd $(distdir)/=build \
+ && ../configure --srcdir=.. --prefix=$$dc_install_base \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -407,39 +340,23 @@ distcheck: dist
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
&& $(MAKE) $(AM_MAKEFLAGS) uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
- distuninstallcheck \
- && chmod -R a-w "$$dc_install_base" \
- && ({ \
- (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
- distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
- } || { rm -rf "$$dc_destdir"; exit 1; }) \
- && rm -rf "$$dc_destdir" \
+ && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ find $$dc_install_base -type f -print ; \
+ exit 1; } >&2 ) \
&& $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
&& rm -f $(distdir).tar.gz \
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck
$(am__remove_distdir)
@echo "$(distdir).tar.gz is ready for distribution" | \
sed 'h;s/./=/g;p;x;p;x'
-distuninstallcheck:
- @cd $(distuninstallcheck_dir) \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
- || { echo "ERROR: files left after uninstall:" ; \
- if test -n "$(DESTDIR)"; then \
- echo " (check DESTDIR support)"; \
- fi ; \
- $(distuninstallcheck_listfiles) ; \
- exit 1; } >&2
distcleancheck: distclean
- @if test '$(srcdir)' = . ; then \
+ if test '$(srcdir)' = . ; then \
echo "ERROR: distcleancheck can only run from a VPATH build" ; \
exit 1 ; \
fi
- @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
- || { echo "ERROR: files left in build directory after distclean:" ; \
+ test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left after distclean:" ; \
$(distcleancheck_listfiles) ; \
exit 1; } >&2
check-am: all-am
@@ -459,7 +376,7 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -467,7 +384,7 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@@ -480,7 +397,6 @@ clean-am: clean-generic mostlyclean-am
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
dvi: dvi-recursive
@@ -503,8 +419,7 @@ installcheck-am:
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf $(top_srcdir)/autom4te.cache
- -rm -f Makefile
+ -rm -rf autom4te.cache
maintainer-clean-am: distclean-am maintainer-clean-generic \
maintainer-clean-local
@@ -512,24 +427,15 @@ mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
uninstall-am: uninstall-info-am
uninstall-info: uninstall-info-recursive
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
- clean-generic clean-recursive ctags ctags-recursive dist \
- dist-all dist-gzip distcheck distclean distclean-generic \
- distclean-hdr distclean-recursive distclean-tags distcleancheck \
- distdir distuninstallcheck dvi dvi-am dvi-recursive info \
- info-am info-recursive install install-am install-data \
+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
+ clean-generic clean-recursive dist dist-all dist-gzip distcheck \
+ distclean distclean-generic distclean-hdr distclean-recursive \
+ distclean-tags distcleancheck distdir dvi dvi-am dvi-recursive \
+ info info-am info-recursive install install-am install-data \
install-data-am install-data-recursive install-exec \
install-exec-am install-exec-recursive install-info \
install-info-am install-info-recursive install-man \
@@ -537,8 +443,7 @@ uninstall-info: uninstall-info-recursive
installdirs installdirs-am installdirs-recursive \
maintainer-clean maintainer-clean-generic \
maintainer-clean-local maintainer-clean-recursive mostlyclean \
- mostlyclean-generic mostlyclean-recursive pdf pdf-am \
- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+ mostlyclean-generic mostlyclean-recursive tags tags-recursive \
uninstall uninstall-am uninstall-info-am \
uninstall-info-recursive uninstall-recursive
diff --git a/NEWS b/NEWS
index d91a8e4..939dc83 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
Release Notes
~~~~~~~~~~~~~
+Release 0.4.27 - October 8, 2005
+ * GNUTLS 1.2 support
+ * Minor bugfixes.
+
Release 0.4.26 - October 10, 2004
* Don't crash if no certificate is sent by the remote side
and -skip-certificate-check has been given.
@@ -486,4 +490,4 @@ Release 0.1 - Wed, 17 Nov 1999 00:00:00 +0000
* Initial release by Gennady Belyakov <gb at ccat.elect.ru>.
-$Id: NEWS,v 1.60 2004/06/23 21:51:40 bluehal Exp $
+$Id: NEWS,v 1.61 2005/10/08 18:13:09 bluehal Exp $
diff --git a/TODO b/TODO
index a87775d..726f49f 100644
--- a/TODO
+++ b/TODO
@@ -84,8 +84,14 @@ these todo items are welcome.
Try "path.n=shell:::ls -1 directoryname | wc -l".
If it works, tell us. Optionally the patch at sourceforge
could be integrated.
+* Recursive maildir support
+ Aggregation in general is an oft-desired feature.
+* G-Mail support
+ Though the business model of free mail forces screen scrubbing,
+ having someone else write and maintain the interface seems
+ like it would significantly improve the utility of gmail.
-$Id: TODO,v 1.20 2003/07/11 07:05:06 bluehal Exp $
+$Id: TODO,v 1.21 2004/10/31 22:08:42 bluehal Exp $
Local Variables:
mode: outline
diff --git a/aclocal.m4 b/aclocal.m4
index 55e505b..6cac643 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
+# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,7 @@
# This macro actually does too much some checks are only needed if
# your package does certain things. But this isn't really a big deal.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@@ -34,9 +34,16 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-# serial 10
+# serial 8
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery. Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-AC_PREREQ([2.54])
+
+AC_PREREQ([2.52])
# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
# the ones we care about.
@@ -62,16 +69,6 @@ if test "`cd $srcdir && pwd`" != "`pwd`" &&
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
fi
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
- if (cygpath --version) >/dev/null 2>/dev/null; then
- CYGPATH_W='cygpath -w'
- else
- CYGPATH_W=echo
- fi
-fi
-AC_SUBST([CYGPATH_W])
-
# Define the identity of the package.
dnl Distinguish between old-style and new-style calls.
m4_ifval([$2],
@@ -79,8 +76,8 @@ m4_ifval([$2],
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+ AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
+ AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
_AM_IF_OPTION([no-define],,
[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
@@ -101,41 +98,19 @@ AM_PROG_INSTALL_STRIP
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
+[AC_PROVIDE_IFELSE([AC_PROG_][CC],
[_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
+ [define([AC_PROG_][CC],
+ defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_][CXX],
[_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ [define([AC_PROG_][CXX],
+ defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
])
])
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated. The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
- case $_am_header in
- $1 | $1:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
# Copyright 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@@ -156,14 +131,14 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.7.9])])
+ [AM_AUTOMAKE_VERSION([1.6.3])])
# Helper functions for option handling. -*- Autoconf -*-
@@ -449,42 +424,9 @@ fi
INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# -*- Autoconf -*-
-# Copyright (C) 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# serial 4 -*- Autoconf -*-
-# serial 1
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot. For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
- am__leading_dot=.
-else
- am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# serial 5 -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -545,32 +487,18 @@ AC_CACHE_CHECK([dependency style of $depcc],
# using a relative directory.
cp "$am_depcomp" conftest.dir
cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
am_cv_$1_dependencies_compiler_type=none
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
fi
for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
# We need to recreate these files for each test, as the compiler may
# overwrite some of them when testing with obscure command lines.
# This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- : > sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ echo '#include "conftest.h"' > conftest.c
+ echo 'int i;' > conftest.h
+ echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
case $depmode in
nosideeffect)
@@ -588,20 +516,13 @@ AC_CACHE_CHECK([dependency style of $depcc],
# mode. It turns out that the SunPro C++ compiler does not properly
# handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ source=conftest.c object=conftest.o \
+ depfile=conftest.Po tmpdepfile=conftest.TPo \
+ $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
+ grep conftest.h conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # (even with -Werror). So we grep stderr for any message
- # that says an option was ignored.
- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
- am_cv_$1_dependencies_compiler_type=$depmode
- break
- fi
+ am_cv_$1_dependencies_compiler_type=$depmode
+ break
fi
done
@@ -612,9 +533,6 @@ else
fi
])
AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
])
@@ -623,8 +541,16 @@ AM_CONDITIONAL([am__fastdep$1], [
# Choose a directory name for dependency files.
# This macro is AC_REQUIREd in _AM_DEPENDENCIES
AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+[rm -f .deps 2>/dev/null
+mkdir .deps 2>/dev/null
+if test -d .deps; then
+ DEPDIR=.deps
+else
+ # MS-DOS does not allow filenames that begin with a dot.
+ DEPDIR=_deps
+fi
+rmdir .deps 2>/dev/null
+AC_SUBST([DEPDIR])
])
@@ -726,9 +652,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
-# Check to see how 'make' treats includes. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*-
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -753,9 +677,8 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
AC_DEFUN([AM_MAKE_INCLUDE],
[am_make=${MAKE-make}
cat > confinc << 'END'
-am__doit:
+doit:
@echo done
-.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
AC_MSG_CHECKING([for style of include used by $am_make])
@@ -769,7 +692,7 @@ echo "include confinc" > confmf
# In particular we don't look at `^make:' because GNU make might
# be invoked under some other name (usually "gmake"), in which
# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
am__include=include
am__quote=
_am_result=GNU
@@ -783,9 +706,9 @@ if test "$am__include" = "#"; then
_am_result=BSD
fi
fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
+AC_SUBST(am__include)
+AC_SUBST(am__quote)
+AC_MSG_RESULT($_am_result)
rm -f confinc confmf
])
@@ -829,7 +752,7 @@ else
fi
AC_CONFIG_COMMANDS_PRE(
[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
- AC_MSG_ERROR([conditional "$1" was never defined.
+ AC_MSG_ERROR([conditional \"$1\" was never defined.
Usually this means the macro was only invoked conditionally.])
fi])])
@@ -856,8 +779,60 @@ AC_PREREQ([2.52])
# serial 6
-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated. We must strip everything past the first ":",
+# and everything past the last "/".
+
+# _AM_DIRNAME(PATH)
+# -----------------
+# Like AS_DIRNAME, only do it during macro expansion
+AC_DEFUN([_AM_DIRNAME],
+ [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
+ m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
+ m4_if(regexp([$1], [^/.*]), -1,
+ [.],
+ patsubst([$1], [^\(/\).*], [\1])),
+ patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
+ patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
+])# _AM_DIRNAME
+
+
+# The stamp files are numbered to have different names.
+# We could number them on a directory basis, but that's additional
+# complications, let's have a unique counter.
+m4_define([_AM_STAMP_Count], [0])
+
+
+# _AM_STAMP(HEADER)
+# -----------------
+# The name of the stamp file for HEADER.
+AC_DEFUN([_AM_STAMP],
+[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
+AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
+ [:.*])))/stamp-h[]_AM_STAMP_Count])
+
+
+# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
+# ------------------------------------------------------------
+# We used to try to get a real timestamp in stamp-h. But the fear is that
+# that will cause unnecessary cvs conflicts.
+AC_DEFUN([_AM_CONFIG_HEADER],
+[# Add the stamp file to the list of files AC keeps track of,
+# along with our hook.
+AC_CONFIG_HEADERS([$1],
+ [# update the timestamp
+echo 'timestamp for $1' >"_AM_STAMP([$1])"
+$2],
+ [$3])
+])# _AM_CONFIG_HEADER
+
+
+# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
+# --------------------------------------------------------------
+AC_DEFUN([AM_CONFIG_HEADER],
+[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
+])# AM_CONFIG_HEADER
dnl Autoconf macros for libgnutls
dnl $id$
@@ -1185,3 +1160,277 @@ main ()
dnl *-*wedit:notab*-* Please keep this as the last line.
+
+# _AC_PATH_X_DIRECT_CORRECTED
+# -----------------
+# Internal subroutine of _AC_PATH_X.
+# Set ac_x_includes and/or ac_x_libraries.
+m4_define([_AC_PATH_X_DIRECT_CORRECTED],
+[# Standard set of common directories for X headers.
+# Check X11 before X11Rn because it is often a symlink to the current release.
+ac_x_header_dirs='
+/usr/X11/include
+/usr/X11R6/include
+/usr/X11R5/include
+/usr/X11R4/include
+
+/usr/include/X11
+/usr/include/X11R6
+/usr/include/X11R5
+/usr/include/X11R4
+
+/usr/local/X11/include
+/usr/local/X11R6/include
+/usr/local/X11R5/include
+/usr/local/X11R4/include
+
+/usr/local/include/X11
+/usr/local/include/X11R6
+/usr/local/include/X11R5
+/usr/local/include/X11R4
+
+/usr/X386/include
+/usr/x386/include
+/usr/XFree86/include/X11
+
+/usr/include
+/usr/local/include
+/usr/unsupported/include
+/usr/athena/include
+/usr/local/x11r5/include
+/usr/lpp/Xamples/include
+
+/usr/openwin/include
+/usr/openwin/share/include'
+
+if test "$ac_x_includes" = no; then
+ # Guess where to find include files, by looking for Xlib.h.
+ # First, try using that file with no special directory specified.
+ AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Xlib.h>])],
+[# We can compile using X headers with no special include directory.
+ac_x_includes=],
+[for ac_dir in $ac_x_header_dirs; do
+ if test -r "$ac_dir/X11/Xlib.h"; then
+ ac_x_includes=$ac_dir
+ break
+ fi
+done])
+fi # $ac_x_includes = no
+
+if test "$ac_x_libraries" = no; then
+ # Check for the libraries.
+ # See if we find them without any special options.
+ # Don't add to $LIBS permanently.
+ ac_save_LIBS=$LIBS
+ LIBS="-lX11 $LIBS"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>],
+ [XrmInitialize ()])],
+ [LIBS=$ac_save_LIBS
+# We can link X programs with no special library path.
+ac_x_libraries=],
+ [LIBS=$ac_save_LIBS
+for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+do
+ # Don't even attempt the hair of trying to link an X program!
+ for ac_extension in a so sl; do
+ if test -r $ac_dir/libX11.$ac_extension; then
+ ac_x_libraries=$ac_dir
+ break 2
+ fi
+ done
+done])
+fi # $ac_x_libraries = no
+])# _AC_PATH_X_DIRECT
+
+
+# _AC_PATH_X_CORRECTED
+# ----------
+# Compute ac_cv_have_x.
+AC_DEFUN([_AC_PATH_X_CORRECTED],
+[AC_CACHE_VAL(ac_cv_have_x,
+[# One or both of the vars are not set, and there is no cached value.
+ac_x_includes=no ac_x_libraries=no
+_AC_PATH_X_XMKMF
+_AC_PATH_X_DIRECT_CORRECTED
+if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
+ # Didn't find X anywhere. Cache the known absence of X.
+ ac_cv_have_x="have_x=no"
+else
+ # Record where we found X for the cache.
+ ac_cv_have_x="have_x=yes \
+ ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
+fi])dnl
+])
+
+
+# AC_PATH_X
+# ---------
+# If we find X, set shell vars x_includes and x_libraries to the
+# paths, otherwise set no_x=yes.
+# Uses ac_ vars as temps to allow command line to override cache and checks.
+# --without-x overrides everything else, but does not touch the cache.
+AN_HEADER([X11/Xlib.h], [AC_PATH_X])
+AC_DEFUN([AC_PATH_X_CORRECTED],
+[dnl Document the X abnormal options inherited from history.
+m4_divert_once([HELP_BEGIN], [
+X features:
+ --x-includes=DIR X include files are in DIR
+ --x-libraries=DIR X library files are in DIR])dnl
+AC_MSG_CHECKING([for X])
+
+AC_ARG_WITH(x, [ --with-x use the X Window System])
+# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
+if test "x$with_x" = xno; then
+ # The user explicitly disabled X.
+ have_x=disabled
+else
+ if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
+ # Both variables are already set.
+ have_x=yes
+ else
+ _AC_PATH_X_CORRECTED
+ fi
+ eval "$ac_cv_have_x"
+fi # $with_x != no
+
+if test "$have_x" != yes; then
+ AC_MSG_RESULT([$have_x])
+ no_x=yes
+else
+ # If each of the values was on the command line, it overrides each guess.
+ test "x$x_includes" = xNONE && x_includes=$ac_x_includes
+ test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
+ # Update the cache value to reflect the command line values.
+ ac_cv_have_x="have_x=yes \
+ ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+ AC_MSG_RESULT([libraries $x_libraries, headers $x_includes])
+fi
+])# AC_PATH_X_CORRECTED
+
+
+
+# AC_PATH_XTRA_CORRECTED
+# ------------
+# Find additional X libraries, magic flags, etc.
+AC_DEFUN([AC_PATH_XTRA_CORRECTED],
+[AC_REQUIRE([AC_PATH_X_CORRECTED])dnl
+if test "$no_x" = yes; then
+ # Not all programs may use this symbol, but it does not hurt to define it.
+ AC_DEFINE([X_DISPLAY_MISSING], 1,
+ [Define to 1 if the X Window System is missing or not being used.])
+ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
+else
+ if test -n "$x_includes"; then
+ X_CFLAGS="$X_CFLAGS -I$x_includes"
+ fi
+
+ # It would also be nice to do this for all -L options, not just this one.
+ if test -n "$x_libraries"; then
+ X_LIBS="$X_LIBS -L$x_libraries"
+dnl FIXME: banish uname from this macro!
+ # For Solaris; some versions of Sun CC require a space after -R and
+ # others require no space. Words are not sufficient . . . .
+ case `(uname -sr) 2>/dev/null` in
+ "SunOS 5"*)
+ AC_MSG_CHECKING([whether -R must be followed by a space])
+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM()], ac_R_nospace=yes, ac_R_nospace=no)
+ if test $ac_R_nospace = yes; then
+ AC_MSG_RESULT([no])
+ X_LIBS="$X_LIBS -R$x_libraries"
+ else
+ LIBS="$ac_xsave_LIBS -R $x_libraries"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM()], ac_R_space=yes, ac_R_space=no)
+ if test $ac_R_space = yes; then
+ AC_MSG_RESULT([yes])
+ X_LIBS="$X_LIBS -R $x_libraries"
+ else
+ AC_MSG_RESULT([neither works])
+ fi
+ fi
+ LIBS=$ac_xsave_LIBS
+ esac
+ fi
+
+ # Check for system-dependent libraries X programs must link with.
+ # Do this before checking for the system-independent R6 libraries
+ # (-lICE), since we may need -lsocket or whatever for X linking.
+
+ if test "$ISC" = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
+ else
+ # Martyn Johnson says this is needed for Ultrix, if the X
+ # libraries were built with DECnet support. And Karl Berry says
+ # the Alpha needs dnet_stub (dnet does not exist).
+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+ AC_LINK_IFELSE([AC_LANG_CALL([], [XOpenDisplay])],
+ [],
+ [AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+ AC_CHECK_LIB(dnet_stub, dnet_ntoa,
+ [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
+ fi])
+ LIBS="$ac_xsave_LIBS"
+
+ # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
+ # to get the SysV transport functions.
+ # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
+ # needs -lnsl.
+ # The nsl library prevents programs from opening the X display
+ # on Irix 5.2, according to T.E. Dickey.
+ # The functions gethostbyname, getservbyname, and inet_addr are
+ # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+ AC_CHECK_FUNC(gethostbyname)
+ if test $ac_cv_func_gethostbyname = no; then
+ AC_CHECK_LIB(nsl, gethostbyname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl")
+ if test $ac_cv_lib_nsl_gethostbyname = no; then
+ AC_CHECK_LIB(bsd, gethostbyname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd")
+ fi
+ fi
+
+ # lieder at skyler.mavd.honeywell.com says without -lsocket,
+ # socket/setsockopt and other routines are undefined under SCO ODT
+ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
+ # on later versions), says Simon Leinen: it contains gethostby*
+ # variants that don't use the name server (or something). -lsocket
+ # must be given before -lnsl if both are needed. We assume that
+ # if connect needs -lnsl, so does gethostbyname.
+ AC_CHECK_FUNC(connect)
+ if test $ac_cv_func_connect = no; then
+ AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", ,
+ $X_EXTRA_LIBS)
+ fi
+
+ # Guillermo Gomez says -lposix is necessary on A/UX.
+ AC_CHECK_FUNC(remove)
+ if test $ac_cv_func_remove = no; then
+ AC_CHECK_LIB(posix, remove, X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix")
+ fi
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+ AC_CHECK_FUNC(shmat)
+ if test $ac_cv_func_shmat = no; then
+ AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc")
+ fi
+ fi
+
+ # Check for libraries that X11R6 Xt/Xaw programs need.
+ ac_save_LDFLAGS=$LDFLAGS
+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
+ # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
+ # check for ICE first), but we must link in the order -lSM -lICE or
+ # we get undefined symbols. So assume we have SM if we have ICE.
+ # These have to be linked with before -lX11, unlike the other
+ # libraries we check for below, so use a different variable.
+ # John Interrante, Karl Berry
+ AC_CHECK_LIB(ICE, IceConnectionNumber,
+ [X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"], , $X_EXTRA_LIBS)
+ LDFLAGS=$ac_save_LDFLAGS
+
+fi
+AC_SUBST(X_CFLAGS)dnl
+AC_SUBST(X_PRE_LIBS)dnl
+AC_SUBST(X_LIBS)dnl
+AC_SUBST(X_EXTRA_LIBS)dnl
+])# AC_PATH_XTRA_CORRECTED
+
diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in
index 3a8e41d..39c381f 100644
--- a/autoconf/Makefile.in
+++ b/autoconf/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -13,80 +13,74 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
CVS2CL = @CVS2CL@
-CYGPATH_W = @CYGPATH_W@
DEFAULT_ASKPASS = @DEFAULT_ASKPASS@
-DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
GCRYPT_MAN_STATUS = @GCRYPT_MAN_STATUS@
GNUTLS_COMMON_O = @GNUTLS_COMMON_O@
GNUTLS_MAN_STATUS = @GNUTLS_MAN_STATUS@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
SKINDIR = @SKINDIR@
STRIP = @STRIP@
VERSION = @VERSION@
@@ -94,43 +88,18 @@ X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
-am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
EXTRA_DIST =
subdir = autoconf
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am depcomp install-sh \
- missing mkinstalldirs
+DIST_COMMON = Makefile.am Makefile.in depcomp install-sh missing \
+ mkinstalldirs
all: all-am
.SUFFIXES:
@@ -143,22 +112,13 @@ uninstall-info-am:
tags: TAGS
TAGS:
-ctags: CTAGS
-CTAGS:
-
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @list='$(DISTFILES)'; for file in $$list; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -183,6 +143,7 @@ check: check-am
all-am: Makefile
installdirs:
+
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -194,7 +155,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -202,7 +163,7 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -212,7 +173,7 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
- -rm -f Makefile
+
distclean-am: clean-am distclean-generic
dvi: dvi-am
@@ -234,21 +195,13 @@ install-man:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f Makefile
+
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
uninstall-am: uninstall-info-am
.PHONY: all all-am check check-am clean clean-generic distclean \
@@ -257,8 +210,7 @@ uninstall-am: uninstall-info-am
install-exec-am install-info install-info-am install-man \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
+ mostlyclean-generic uninstall uninstall-am uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/autoconf/install-sh b/autoconf/install-sh
index 36f96f3..fca26e5 100755
--- a/autoconf/install-sh
+++ b/autoconf/install-sh
@@ -1,19 +1,37 @@
#!/bin/sh
#
# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
#
-# Copyright 1991 by the Massachusetts Institute of Technology
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission. M.I.T. makes no representations about the
-# suitability of this software for any purpose. It is provided "as is"
-# without express or implied warranty.
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
# `make' implicit rules from creating a file called install from it
@@ -56,7 +74,7 @@ dir_arg=""
while [ x"$1" != x ]; do
case $1 in
- -c) instcmd=$cpprog
+ -c) instcmd="$cpprog"
shift
continue;;
@@ -79,7 +97,7 @@ while [ x"$1" != x ]; do
shift
continue;;
- -s) stripcmd=$stripprog
+ -s) stripcmd="$stripprog"
shift
continue;;
@@ -106,7 +124,7 @@ done
if [ x"$src" = x ]
then
- echo "$0: no input file specified" >&2
+ echo "install: no input file specified"
exit 1
else
:
@@ -115,8 +133,8 @@ fi
if [ x"$dir_arg" != x ]; then
dst=$src
src=""
-
- if [ -d "$dst" ]; then
+
+ if [ -d $dst ]; then
instcmd=:
chmodcmd=""
else
@@ -125,20 +143,20 @@ if [ x"$dir_arg" != x ]; then
else
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
+# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
if [ -f "$src" ] || [ -d "$src" ]
then
:
else
- echo "$0: $src does not exist" >&2
+ echo "install: $src does not exist"
exit 1
fi
-
+
if [ x"$dst" = x ]
then
- echo "$0: no destination specified" >&2
+ echo "install: no destination specified"
exit 1
else
:
@@ -147,16 +165,16 @@ else
# If destination is a directory, append the input filename; if your system
# does not like double slashes in filenames, you may need to add some logic
- if [ -d "$dst" ]
+ if [ -d $dst ]
then
- dst=$dst/`basename "$src"`
+ dst="$dst"/`basename $src`
else
:
fi
fi
## this sed command emulates the dirname command
-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
# Make sure that the destination directory exists.
# this part is taken from Noah Friedman's mkinstalldirs script
@@ -165,73 +183,69 @@ dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
if [ ! -d "$dstdir" ]; then
defaultIFS='
'
-IFS="${IFS-$defaultIFS}"
+IFS="${IFS-${defaultIFS}}"
-oIFS=$IFS
+oIFS="${IFS}"
# Some sh's can't handle IFS=/ for some reason.
IFS='%'
-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS=$oIFS
+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS="${oIFS}"
pathcomp=''
while [ $# -ne 0 ] ; do
- pathcomp=$pathcomp$1
+ pathcomp="${pathcomp}${1}"
shift
- if [ ! -d "$pathcomp" ] ;
+ if [ ! -d "${pathcomp}" ] ;
then
- $mkdirprog "$pathcomp"
+ $mkdirprog "${pathcomp}"
else
:
fi
- pathcomp=$pathcomp/
+ pathcomp="${pathcomp}/"
done
fi
if [ x"$dir_arg" != x ]
then
- $doit $instcmd "$dst" &&
+ $doit $instcmd $dst &&
- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
+ if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
+ if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
+ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
else
# If we're going to rename the final executable, determine the name now.
- if [ x"$transformarg" = x ]
+ if [ x"$transformarg" = x ]
then
- dstfile=`basename "$dst"`
+ dstfile=`basename $dst`
else
- dstfile=`basename "$dst" $transformbasename |
+ dstfile=`basename $dst $transformbasename |
sed $transformarg`$transformbasename
fi
# don't allow the sed command to completely eliminate the filename
- if [ x"$dstfile" = x ]
+ if [ x"$dstfile" = x ]
then
- dstfile=`basename "$dst"`
+ dstfile=`basename $dst`
else
:
fi
-# Make a couple of temp file names in the proper directory.
+# Make a temp file name in the proper directory.
dsttmp=$dstdir/#inst.$$#
- rmtmp=$dstdir/#rm.$$#
-
-# Trap to clean up temp files at exit.
-
- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
- trap '(exit $?); exit' 1 2 13 15
# Move or copy the file name to the temp name
- $doit $instcmd "$src" "$dsttmp" &&
+ $doit $instcmd $src $dsttmp &&
+
+ trap "rm -f ${dsttmp}" 0 &&
# and set any options; do chmod last to preserve setuid bits
@@ -239,38 +253,17 @@ else
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $instcmd $src $dsttmp" command.
- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
-
-# Now remove or move aside any old file at destination location. We try this
-# two ways since rm can't unlink itself on some systems and the destination
-# file might be busy for other reasons. In this case, the final cleanup
-# might fail but the new file should still install successfully.
-
-{
- if [ -f "$dstdir/$dstfile" ]
- then
- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
- $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
- {
- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
- (exit 1); exit
- }
- else
- :
- fi
-} &&
+ if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
+ if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
+ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
# Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+ $doit $rmcmd -f $dstdir/$dstfile &&
+ $doit $mvcmd $dsttmp $dstdir/$dstfile
fi &&
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
- (exit 0); exit
-}
+exit 0
diff --git a/autoconf/mkinstalldirs b/autoconf/mkinstalldirs
index d2d5f21..8ab885e 100755
--- a/autoconf/mkinstalldirs
+++ b/autoconf/mkinstalldirs
@@ -12,29 +12,18 @@ Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
# process command line arguments
while test $# -gt 0 ; do
- case $1 in
- -h | --help | --h*) # -h for help
- echo "$usage" 1>&2
- exit 0
- ;;
- -m) # -m PERM arg
- shift
- test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
- dirmode=$1
- shift
- ;;
- --) # stop option processing
- shift
- break
- ;;
- -*) # unknown option
- echo "$usage" 1>&2
- exit 1
- ;;
- *) # first non-opt arg
- break
- ;;
- esac
+ case "${1}" in
+ -h | --help | --h* ) # -h for help
+ echo "${usage}" 1>&2; exit 0 ;;
+ -m ) # -m PERM arg
+ shift
+ test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
+ dirmode="${1}"
+ shift ;;
+ -- ) shift; break ;; # stop option processing
+ -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option
+ * ) break ;; # first non-opt arg
+ esac
done
for file
@@ -47,65 +36,64 @@ do
done
case $# in
- 0) exit 0 ;;
+0) exit 0 ;;
esac
case $dirmode in
- '')
- if mkdir -p -- . 2>/dev/null; then
- echo "mkdir -p -- $*"
- exec mkdir -p -- "$@"
- fi
- ;;
- *)
- if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
- echo "mkdir -m $dirmode -p -- $*"
- exec mkdir -m "$dirmode" -p -- "$@"
- fi
- ;;
+'')
+ if mkdir -p -- . 2>/dev/null; then
+ echo "mkdir -p -- $*"
+ exec mkdir -p -- "$@"
+ fi ;;
+*)
+ if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+ echo "mkdir -m $dirmode -p -- $*"
+ exec mkdir -m "$dirmode" -p -- "$@"
+ fi ;;
esac
for file
do
- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
- shift
-
- pathcomp=
- for d
- do
- pathcomp="$pathcomp$d"
- case $pathcomp in
- -*) pathcomp=./$pathcomp ;;
- esac
-
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp"
-
- mkdir "$pathcomp" || lasterr=$?
-
- if test ! -d "$pathcomp"; then
- errstatus=$lasterr
- else
- if test ! -z "$dirmode"; then
- echo "chmod $dirmode $pathcomp"
- lasterr=""
- chmod "$dirmode" "$pathcomp" || lasterr=$?
-
- if test ! -z "$lasterr"; then
- errstatus=$lasterr
- fi
- fi
- fi
- fi
-
- pathcomp="$pathcomp/"
- done
+ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+ shift
+
+ pathcomp=
+ for d
+ do
+ pathcomp="$pathcomp$d"
+ case "$pathcomp" in
+ -* ) pathcomp=./$pathcomp ;;
+ esac
+
+ if test ! -d "$pathcomp"; then
+ echo "mkdir $pathcomp"
+
+ mkdir "$pathcomp" || lasterr=$?
+
+ if test ! -d "$pathcomp"; then
+ errstatus=$lasterr
+ else
+ if test ! -z "$dirmode"; then
+ echo "chmod $dirmode $pathcomp"
+
+ lasterr=""
+ chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+ if test ! -z "$lasterr"; then
+ errstatus=$lasterr
+ fi
+ fi
+ fi
+ fi
+
+ pathcomp="$pathcomp/"
+ done
done
exit $errstatus
# Local Variables:
# mode: shell-script
-# sh-indentation: 2
+# sh-indentation: 3
# End:
# mkinstalldirs ends here
diff --git a/configure b/configure
index 2a32664..ff1d421 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for WMBiff 0.4.26.
+# Generated by GNU Autoconf 2.59 for WMBiff 0.4.27.
#
# Report bugs to <wmbiff-devel at lists.sourceforge.net>.
#
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='WMBiff'
PACKAGE_TARNAME='wmbiff'
-PACKAGE_VERSION='0.4.26'
-PACKAGE_STRING='WMBiff 0.4.26'
+PACKAGE_VERSION='0.4.27'
+PACKAGE_STRING='WMBiff 0.4.27'
PACKAGE_BUGREPORT='wmbiff-devel at lists.sourceforge.net'
# Factoring default headers for most tests.
@@ -310,7 +310,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STR [...]
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL [...]
ac_subst_files=''
# Initialize some variables set by options.
@@ -779,7 +779,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures WMBiff 0.4.26 to adapt to many kinds of systems.
+\`configure' configures WMBiff 0.4.27 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -845,7 +845,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of WMBiff 0.4.26:";;
+ short | recursive ) echo "Configuration of WMBiff 0.4.27:";;
esac
cat <<\_ACEOF
@@ -972,7 +972,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-WMBiff configure 0.4.26
+WMBiff configure 0.4.27
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -986,7 +986,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by WMBiff $as_me 0.4.26, which was
+It was created by WMBiff $as_me 0.4.27, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1347,7 +1347,7 @@ ac_config_guess="$SHELL $ac_aux_dir/config.guess"
ac_config_sub="$SHELL $ac_aux_dir/config.sub"
ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-am__api_version="1.7"
+am__api_version="1.6"
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
@@ -1568,15 +1568,6 @@ echo "${ECHO_T}no" >&6
SET_MAKE="MAKE=${MAKE-make}"
fi
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
- am__leading_dot=.
-else
- am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
# test to see if srcdir already configured
if test "`cd $srcdir && pwd`" != "`pwd`" &&
test -f $srcdir/config.status; then
@@ -1585,19 +1576,9 @@ echo "$as_me: error: source directory already configured; run \"make distclean\"
{ (exit 1); exit 1; }; }
fi
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
- if (cygpath --version) >/dev/null 2>/dev/null; then
- CYGPATH_W='cygpath -w'
- else
- CYGPATH_W=echo
- fi
-fi
-
-
# Define the identity of the package.
PACKAGE=wmbiff
- VERSION=0.4.26
+ VERSION=0.4.27
cat >>confdefs.h <<_ACEOF
@@ -1722,7 +1703,11 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
# some platforms.
- ac_config_headers="$ac_config_headers config.h"
+ # Add the stamp file to the list of files AC keeps track of,
+# along with our hook.
+ ac_config_headers="$ac_config_headers config.h"
+
+
@@ -2730,16 +2715,24 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
+rm -f .deps 2>/dev/null
+mkdir .deps 2>/dev/null
+if test -d .deps; then
+ DEPDIR=.deps
+else
+ # MS-DOS does not allow filenames that begin with a dot.
+ DEPDIR=_deps
+fi
+rmdir .deps 2>/dev/null
+
ac_config_commands="$ac_config_commands depfiles"
am_make=${MAKE-make}
cat > confinc << 'END'
-am__doit:
+doit:
@echo done
-.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
@@ -2754,7 +2747,7 @@ echo "include confinc" > confmf
# In particular we don't look at `^make:' because GNU make might
# be invoked under some other name (usually "gmake"), in which
# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
am__include=include
am__quote=
_am_result=GNU
@@ -2814,32 +2807,18 @@ else
# using a relative directory.
cp "$am_depcomp" conftest.dir
cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
am_cv_CC_dependencies_compiler_type=none
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi
for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
# We need to recreate these files for each test, as the compiler may
# overwrite some of them when testing with obscure command lines.
# This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- : > sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ echo '#include "conftest.h"' > conftest.c
+ echo 'int i;' > conftest.h
+ echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
case $depmode in
nosideeffect)
@@ -2857,20 +2836,13 @@ else
# mode. It turns out that the SunPro C++ compiler does not properly
# handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ source=conftest.c object=conftest.o \
+ depfile=conftest.Po tmpdepfile=conftest.TPo \
+ $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
+ grep conftest.h conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # (even with -Werror). So we grep stderr for any message
- # that says an option was ignored.
- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
- am_cv_CC_dependencies_compiler_type=$depmode
- break
- fi
+ am_cv_CC_dependencies_compiler_type=$depmode
+ break
fi
done
@@ -2886,18 +2858,6 @@ echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
- am__fastdepCC_TRUE=
- am__fastdepCC_FALSE='#'
-else
- am__fastdepCC_TRUE='#'
- am__fastdepCC_FALSE=
-fi
-
-
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -5421,12 +5381,9 @@ fi
done
-
-if test "x$ac_path_x_has_been_run" != xyes; then
- echo "$as_me:$LINENO: checking for X" >&5
+echo "$as_me:$LINENO: checking for X" >&5
echo $ECHO_N "checking for X... $ECHO_C" >&6
-ac_path_x_has_been_run=yes
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@@ -5519,7 +5476,7 @@ ac_x_header_dirs='
/usr/openwin/share/include'
if test "$ac_x_includes" = no; then
- # Guess where to find include files, by looking for a specified header file.
+ # Guess where to find include files, by looking for Xlib.h.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5527,7 +5484,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -5554,7 +5511,7 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Intrinsic.h"; then
+ if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
break
fi
@@ -5568,18 +5525,18 @@ if test "$ac_x_libraries" = no; then
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
- LIBS="-lXt $LIBS"
+ LIBS="-lX11 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
int
main ()
{
-XtMalloc (0)
+XrmInitialize ()
;
return 0;
}
@@ -5617,7 +5574,7 @@ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
do
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
- if test -r $ac_dir/libXt.$ac_extension; then
+ if test -r $ac_dir/libX11.$ac_extension; then
ac_x_libraries=$ac_dir
break 2
fi
@@ -5653,15 +5610,10 @@ else
# Update the cache value to reflect the command line values.
ac_cv_have_x="have_x=yes \
ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
- # It might be that x_includes is empty (headers are found in the
- # standard search path. Then output the corresponding message
- ac_out_x_includes=$x_includes
- test "x$x_includes" = x && ac_out_x_includes="in standard search path"
- echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6
+ echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
fi
-fi
if test "$no_x" = yes; then
# Not all programs may use this symbol, but it does not hurt to define it.
@@ -6801,6 +6753,11 @@ fi
fi
+if test "$no_x" = yes; then
+ { { echo "$as_me:$LINENO: error: \"Really need a working X. Check config.log to see why configure couldn't find it\"" >&5
+echo "$as_me: error: \"Really need a working X. Check config.log to see why configure couldn't find it\"" >&2;}
+ { (exit 1); exit 1; }; }
+fi
LIBS="$X_LIBS $LIBS"
CPPFLAGS="$X_CFLAGS $CPPFLAGS"
@@ -6877,9 +6834,9 @@ _ACEOF
fi
-echo "$as_me:$LINENO: checking for XextAddDisplay in -lXext" >&5
-echo $ECHO_N "checking for XextAddDisplay in -lXext... $ECHO_C" >&6
-if test "${ac_cv_lib_Xext_XextAddDisplay+set}" = set; then
+echo "$as_me:$LINENO: checking for XShapeCombineMask in -lXext" >&5
+echo $ECHO_N "checking for XShapeCombineMask in -lXext... $ECHO_C" >&6
+if test "${ac_cv_lib_Xext_XShapeCombineMask+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -6897,11 +6854,11 @@ extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char XextAddDisplay ();
+char XShapeCombineMask ();
int
main ()
{
-XextAddDisplay ();
+XShapeCombineMask ();
;
return 0;
}
@@ -6927,26 +6884,30 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_Xext_XextAddDisplay=yes
+ ac_cv_lib_Xext_XShapeCombineMask=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_Xext_XextAddDisplay=no
+ac_cv_lib_Xext_XShapeCombineMask=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XextAddDisplay" >&5
-echo "${ECHO_T}$ac_cv_lib_Xext_XextAddDisplay" >&6
-if test $ac_cv_lib_Xext_XextAddDisplay = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeCombineMask" >&5
+echo "${ECHO_T}$ac_cv_lib_Xext_XShapeCombineMask" >&6
+if test $ac_cv_lib_Xext_XShapeCombineMask = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBXEXT 1
_ACEOF
LIBS="-lXext $LIBS"
+else
+ { { echo "$as_me:$LINENO: error: libXext not found or does not include XShape" >&5
+echo "$as_me: error: libXext not found or does not include XShape" >&2;}
+ { (exit 1); exit 1; }; }
fi
@@ -7745,13 +7706,6 @@ echo "$as_me: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -8023,7 +7977,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by WMBiff $as_me 0.4.26, which was
+This file was extended by WMBiff $as_me 0.4.27, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8086,7 +8040,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-WMBiff config.status 0.4.26
+WMBiff config.status 0.4.27
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -8292,7 +8246,6 @@ s, at LIBS@,$LIBS,;t t
s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
s, at INSTALL_DATA@,$INSTALL_DATA,;t t
-s, at CYGPATH_W@,$CYGPATH_W,;t t
s, at PACKAGE@,$PACKAGE,;t t
s, at VERSION@,$VERSION,;t t
s, at ACLOCAL@,$ACLOCAL,;t t
@@ -8307,7 +8260,6 @@ s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
s, at AWK@,$AWK,;t t
s, at SET_MAKE@,$SET_MAKE,;t t
-s, at am__leading_dot@,$am__leading_dot,;t t
s, at CC@,$CC,;t t
s, at CFLAGS@,$CFLAGS,;t t
s, at LDFLAGS@,$LDFLAGS,;t t
@@ -8322,8 +8274,6 @@ s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
s, at CCDEPMODE@,$CCDEPMODE,;t t
-s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
s, at RANLIB@,$RANLIB,;t t
s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
s, at CPP@,$CPP,;t t
@@ -8806,29 +8756,13 @@ echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
cat $tmp/config.h
rm -f $tmp/config.h
fi
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
- case $_am_header in
- $ac_file | $ac_file:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ # Run the commands associated with the file.
+ case $ac_file in
+ config.h ) # update the timestamp
+echo 'timestamp for config.h' >"./stamp-h1"
+ ;;
esac
done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X$ac_file : 'X\(//\)[^/]' \| \
- X$ac_file : 'X\(//\)$' \| \
- X$ac_file : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X$ac_file |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`/stamp-h$_am_stamp_count
-done
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
diff --git a/configure.ac b/configure.ac
index e9f0626..f74b1f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,9 +6,9 @@ dnl and configure:
dnl installation prefix
dnl version
-AC_INIT(WMBiff, 0.4.26, wmbiff-devel at lists.sourceforge.net, wmbiff)
+AC_INIT(WMBiff, 0.4.27, wmbiff-devel at lists.sourceforge.net, wmbiff)
AC_CONFIG_AUX_DIR(autoconf)
-AM_INIT_AUTOMAKE(wmbiff, 0.4.26) dnl tarded syntax for automake <= 1.5
+AM_INIT_AUTOMAKE(wmbiff, 0.4.27) dnl tarded syntax for automake <= 1.5
AM_CONFIG_HEADER(config.h)
dnl make sure autoheader finds version, implicitly defined above.
AH_TEMPLATE([VERSION], [wmbiff's release version])
@@ -110,13 +110,16 @@ AC_CHECK_HEADERS(regex.h) dnl gnuregex.h
dnl no longer needed AC_CHECK_LIB(gnuregex, re_search) dnl BSD.
dnl X11 stuff.
-AC_PATH_XTRA
+AC_PATH_XTRA_CORRECTED
+if test "$no_x" = yes; then
+ AC_MSG_ERROR("Really need a working X. Check config.log to see why configure couldn't find it")
+fi
LIBS="$X_LIBS $LIBS"
dnl want to get the -I flags so that later tests for include files work.
dnl the preprocessor is used for check_headers, which doesn't use cflags.
CPPFLAGS="$X_CFLAGS $CPPFLAGS"
AC_CHECK_LIB(X11, XrmParseCommand)
-AC_CHECK_LIB(Xext, XextAddDisplay)
+AC_CHECK_LIB(Xext, XShapeCombineMask, , AC_MSG_ERROR(libXext not found or does not include XShape))
AC_CHECK_LIB(Xpm, XpmCreateImageFromXpmImage)
AC_CHECK_HEADERS(X11/xpm.h, [], [AC_CHECK_HEADERS(xpm.h, [], AC_MSG_ERROR([xpm.h is needed]))])
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 0b53f94..a8917b4 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -13,80 +13,74 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
CVS2CL = @CVS2CL@
-CYGPATH_W = @CYGPATH_W@
DEFAULT_ASKPASS = @DEFAULT_ASKPASS@
-DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
GCRYPT_MAN_STATUS = @GCRYPT_MAN_STATUS@
GNUTLS_COMMON_O = @GNUTLS_COMMON_O@
GNUTLS_MAN_STATUS = @GNUTLS_MAN_STATUS@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
SKINDIR = @SKINDIR@
STRIP = @STRIP@
VERSION = @VERSION@
@@ -94,44 +88,19 @@ X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
-am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
pkglib_SCRIPTS = security.debian.rb
EXTRA_DIST = security.debian.rb
subdir = scripts
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SCRIPTS = $(pkglib_SCRIPTS)
DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
@@ -164,22 +133,13 @@ uninstall-info-am:
tags: TAGS
TAGS:
-ctags: CTAGS
-CTAGS:
-
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @list='$(DISTFILES)'; for file in $$list; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -205,6 +165,7 @@ all-am: Makefile $(SCRIPTS)
installdirs:
$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
+
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -216,7 +177,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -224,7 +185,7 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -234,7 +195,7 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
- -rm -f Makefile
+
distclean-am: clean-am distclean-generic
dvi: dvi-am
@@ -256,21 +217,13 @@ install-man:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f Makefile
+
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
uninstall-am: uninstall-info-am uninstall-pkglibSCRIPTS
.PHONY: all all-am check check-am clean clean-generic distclean \
@@ -279,8 +232,8 @@ uninstall-am: uninstall-info-am uninstall-pkglibSCRIPTS
install-exec-am install-info install-info-am install-man \
install-pkglibSCRIPTS install-strip installcheck \
installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ uninstall uninstall-am uninstall-info-am \
uninstall-pkglibSCRIPTS
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/wmbiff/Client.h b/wmbiff/Client.h
index f9162e5..db3c6d7 100644
--- a/wmbiff/Client.h
+++ b/wmbiff/Client.h
@@ -1,11 +1,11 @@
-/* $Id: Client.h,v 1.41 2004/06/19 20:53:01 bluehal Exp $ */
+/* $Id: Client.h,v 1.42 2005/05/08 21:31:22 bluehal 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 )
*
* Email Checker Pop3/Imap4/Licq/Gicu/mbox/maildir/finger
*
- * Last Updated : $Date: 2004/06/19 20:53:01 $
+ * Last Updated : $Date: 2005/05/08 21:31:22 $
*
*/
@@ -170,6 +170,25 @@ do { \
#define TRUE (!FALSE)
#endif
+#ifdef __LCLINT__
+/* lclint doesn't do typeof */
+#define min(x,y) ((x > y) ? x : y)
+#define max(x,y) ((x > y) ? x : y)
+#else
+/* from linux/kernel.h */
+#define min(x,y) ({ \
+ const typeof(x) _xi = (x); \
+ const typeof(y) _yi = (y); \
+ (void) (&_xi == &_yi); \
+ _xi < _yi ? _xi : _yi; })
+#define max(x,y) ({ \
+ const typeof(x) _xa = (x); \
+ const typeof(y) _ya = (y); \
+ (void) (&_xa == &_ya); \
+ _xa > _ya ? _xa : _ya; })
+#endif
+
+
/* vim:set ts=4: */
/*
* Local Variables:
diff --git a/wmbiff/Makefile.in b/wmbiff/Makefile.in
index 6b0caf3..2bd658a 100644
--- a/wmbiff/Makefile.in
+++ b/wmbiff/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -13,80 +13,74 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
CVS2CL = @CVS2CL@
-CYGPATH_W = @CYGPATH_W@
DEFAULT_ASKPASS = @DEFAULT_ASKPASS@
-DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
GCRYPT_MAN_STATUS = @GCRYPT_MAN_STATUS@
GNUTLS_COMMON_O = @GNUTLS_COMMON_O@
GNUTLS_MAN_STATUS = @GNUTLS_MAN_STATUS@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
SKINDIR = @SKINDIR@
STRIP = @STRIP@
VERSION = @VERSION@
@@ -94,33 +88,9 @@ X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
-am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
TESTS = test_wmbiff test_tlscomm
noinst_PROGRAMS = test_wmbiff test_tlscomm
bin_PROGRAMS = wmbiff
@@ -149,7 +119,6 @@ EXTRA_DIST = $(man_MANS) sample.wmbiffrc wmbiff-master-led.xpm
MAINTAINERCLEANFILES = Makefile.in
subdir = wmbiff
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = wmbiffrc.5
@@ -177,7 +146,11 @@ am_wmbiff_OBJECTS = wmbiff.$(OBJEXT) socket.$(OBJEXT) \
wmbiff_OBJECTS = $(am_wmbiff_OBJECTS)
wmbiff_LDFLAGS =
+DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp
am__depfiles_maybe = depfiles
@AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/Imap4Client.Po \
@@ -196,6 +169,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = @CFLAGS@
DIST_SOURCES = $(test_tlscomm_SOURCES) $(test_wmbiff_SOURCES) \
$(EXTRA_test_wmbiff_SOURCES) $(wmbiff_SOURCES) \
$(EXTRA_wmbiff_SOURCES)
@@ -204,7 +178,7 @@ NROFF = nroff
MANS = $(man_MANS)
DATA = $(skin_DATA)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am wmbiffrc.5.in
+DIST_COMMON = Makefile.am Makefile.in wmbiffrc.5.in
SOURCES = $(test_tlscomm_SOURCES) $(test_wmbiff_SOURCES) $(EXTRA_test_wmbiff_SOURCES) $(wmbiff_SOURCES) $(EXTRA_wmbiff_SOURCES)
all: all-am
@@ -228,7 +202,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
else :; fi; \
done
@@ -278,27 +252,21 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tlsComm.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wmbiff.Po at am__quote@
+distclean-depend:
+ -rm -rf ./$(DEPDIR)
+
.c.o:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
- at am__fastdepCC_TRUE@ fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
.c.obj:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
- at am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
- at am__fastdepCC_TRUE@ fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
uninstall-info-am:
man1dir = $(mandir)/man1
@@ -337,10 +305,6 @@ uninstall-man1:
done; \
for i in $$list; do \
ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- case "$$ext" in \
- 1*) ;; \
- *) ext='1' ;; \
- esac; \
inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
inst=`echo $$inst | sed -e 's/^.*\///'`; \
inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -384,10 +348,6 @@ uninstall-man5:
done; \
for i in $$list; do \
ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- case "$$ext" in \
- 5*) ;; \
- *) ext='5' ;; \
- esac; \
inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
inst=`echo $$inst | sed -e 's/^.*\///'`; \
inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -416,9 +376,6 @@ uninstall-skinDATA:
ETAGS = etags
ETAGSFLAGS =
-CTAGS = ctags
-CTAGSFLAGS =
-
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -444,31 +401,16 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
check-TESTS: $(TESTS)
- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ @failed=0; all=0; xfail=0; xpass=0; \
srcdir=$(srcdir); export srcdir; \
list='$(TESTS)'; \
if test -n "$$list"; then \
@@ -500,9 +442,6 @@ check-TESTS: $(TESTS)
echo "FAIL: $$tst"; \
;; \
esac; \
- else \
- skip=`expr $$skip + 1`; \
- echo "SKIP: $$tst"; \
fi; \
done; \
if test "$$failed" -eq 0; then \
@@ -518,24 +457,9 @@ check-TESTS: $(TESTS)
banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
fi; \
fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
- skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \
- dashes="$$skipped"; \
- fi; \
- report=""; \
- if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
- report="Please report to $(PACKAGE_BUGREPORT)"; \
- test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
+ dashes=`echo "$$banner" | sed s/./=/g`; \
echo "$$dashes"; \
echo "$$banner"; \
- test -n "$$skipped" && echo "$$skipped"; \
- test -n "$$report" && echo "$$report"; \
echo "$$dashes"; \
test "$$failed" -eq 0; \
else :; fi
@@ -545,13 +469,7 @@ top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @list='$(DISTFILES)'; for file in $$list; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -578,6 +496,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA)
installdirs:
$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) $(DESTDIR)$(skindir)
+
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -589,7 +508,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -597,7 +516,7 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -609,10 +528,9 @@ clean-am: clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \
mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-local distclean-tags
+
+distclean-am: clean-am distclean-compile distclean-depend \
+ distclean-generic distclean-local distclean-tags
dvi: dvi-am
@@ -633,40 +551,30 @@ install-man: install-man1 install-man5
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
+
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man \
uninstall-skinDATA
uninstall-man: uninstall-man1 uninstall-man5
-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-binPROGRAMS clean-generic clean-noinstPROGRAMS ctags \
- distclean distclean-compile distclean-generic distclean-local \
- distclean-tags distdir dvi dvi-am info info-am install \
- install-am install-binPROGRAMS install-data install-data-am \
- install-exec install-exec-am install-info install-info-am \
- install-man install-man1 install-man5 install-skinDATA \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-binPROGRAMS \
- uninstall-info-am uninstall-man uninstall-man1 uninstall-man5 \
- uninstall-skinDATA
+.PHONY: GTAGS all all-am check check-TESTS check-am clean \
+ clean-binPROGRAMS clean-generic clean-noinstPROGRAMS distclean \
+ distclean-compile distclean-depend distclean-generic \
+ distclean-local distclean-tags distdir dvi dvi-am info info-am \
+ install install-am install-binPROGRAMS install-data \
+ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-man install-man1 install-man5 \
+ install-skinDATA install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic tags \
+ uninstall uninstall-am uninstall-binPROGRAMS uninstall-info-am \
+ uninstall-man uninstall-man1 uninstall-man5 uninstall-skinDATA
# CODING STYLE AND INDENTATION [2001-Mar-12]:
diff --git a/wmbiff/MessageList.c b/wmbiff/MessageList.c
index 76d47b0..3cda108 100644
--- a/wmbiff/MessageList.c
+++ b/wmbiff/MessageList.c
@@ -10,8 +10,6 @@
#include <X11/Xutil.h> /* needed for Region on solaris? */
#include <assert.h>
-#define min(a,b) ((a)<(b) ? (a) : (b))
-#define max(a,b) ((a)>(b) ? (a) : (b))
#define LEFT_MAR 6
#define RIGHT_MAR 6
#define COL_SEP 4
diff --git a/wmbiff/Pop3Client.c b/wmbiff/Pop3Client.c
index dd138db..2cd350f 100644
--- a/wmbiff/Pop3Client.c
+++ b/wmbiff/Pop3Client.c
@@ -1,4 +1,4 @@
-/* $Id: Pop3Client.c,v 1.22 2004/06/19 20:53:01 bluehal Exp $ */
+/* $Id: Pop3Client.c,v 1.23 2004/12/12 00:01:53 bluehal 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 )
@@ -19,23 +19,27 @@
#include "regulo.h"
#include "MessageList.h"
#include <strings.h>
+#include "tlsComm.h"
+#include "passwordMgr.h"
#ifdef USE_DMALLOC
#include <dmalloc.h>
#endif
extern int Relax;
+/* temp */
+static void ask_user_for_password( /*@notnull@ */ Pop3 pc, int bFlushCache);
#define PCU (pc->u).pop_imap
#define POP_DM(pc, lvl, args...) DM(pc, lvl, "pop3: " args)
#ifdef HAVE_GCRYPT_H
-static FILE *authenticate_md5( /*@notnull@ */ Pop3 pc, FILE * fp,
+static struct connection_state *authenticate_md5( /*@notnull@ */ Pop3 pc, struct connection_state * scs,
char *unused);
-static FILE *authenticate_apop( /*@notnull@ */ Pop3 pc, FILE * fp,
+static struct connection_state *authenticate_apop( /*@notnull@ */ Pop3 pc, struct connection_state * scs,
char *apop_str);
#endif
-static FILE *authenticate_plaintext( /*@notnull@ */ Pop3 pc, FILE * fp,
+static struct connection_state *authenticate_plaintext( /*@notnull@ */ Pop3 pc, struct connection_state * scs,
char *unused);
void pop3_cacheHeaders( /*@notnull@ */ Pop3 pc);
@@ -48,9 +52,9 @@ extern struct connection_state *state_for_pcu(Pop3 pc);
static struct authentication_method {
const char *name;
- /* callback returns the filehandle if successful,
+ /* callback returns the connection state pointer if successful,
NULL if failed */
- FILE *(*auth_callback) (Pop3 pc, FILE * fp, char *apop_str);
+ struct connection_state *(*auth_callback) (Pop3 pc, struct connection_state * scs, char *apop_str);
} auth_methods[] = {
{
#ifdef HAVE_GCRYPT_H
@@ -62,14 +66,16 @@ static struct authentication_method {
};
/*@null@*/
-FILE *pop3Login(Pop3 pc)
+struct connection_state *pop3Login(Pop3 pc)
{
int fd;
- FILE *fp;
char buf[BUF_SIZE];
char apop_str[BUF_SIZE];
char *ptr1, *ptr2;
struct authentication_method *a;
+ struct connection_state *scs;
+ char *connection_name;
+
apop_str[0] = '\0'; /* if defined, server supports apop */
@@ -79,9 +85,20 @@ FILE *pop3Login(Pop3 pc)
return NULL;
}
- fp = fdopen(fd, "r+");
- fgets(buf, BUF_SIZE, fp);
- fflush(fp);
+ connection_name = malloc(strlen(PCU.serverName) + 20);
+ sprintf(connection_name, "%s:%d", PCU.serverName, PCU.serverPort);
+
+ if (PCU.dossl != 0) {
+ scs = initialize_gnutls(fd, connection_name, pc, PCU.serverName);
+ if (scs == NULL) {
+ POP_DM(pc, DEBUG_ERROR, "Failed to initialize TLS\n");
+ return NULL;
+ }
+ } else {
+ scs = initialize_unencrypted(fd, connection_name, pc);
+ }
+
+ tlscomm_gets(buf, BUF_SIZE, scs);
POP_DM(pc, DEBUG_INFO, "%s", buf);
/* Detect APOP, copy challenge into apop_str */
@@ -103,33 +120,32 @@ FILE *pop3Login(Pop3 pc)
/* was it specified or did the user leave it up to us? */
if (PCU.authList[0] == '\0' || strstr(PCU.authList, a->name))
/* did it work? */
- if ((a->auth_callback(pc, fp, apop_str)) != NULL)
- return (fp);
+ if ((a->auth_callback(pc, scs, apop_str)) != NULL)
+ return (scs);
}
/* if authentication worked, we won't get here */
POP_DM(pc, DEBUG_ERROR,
"All Pop3 authentication methods failed for '%s@%s:%d'\n",
PCU.userName, PCU.serverName, PCU.serverPort);
- fprintf(fp, "QUIT\r\n");
- fclose(fp);
+ tlscomm_printf(scs, "QUIT\r\n");
+ tlscomm_close(scs);
+
return NULL;
}
int pop3CheckMail( /*@notnull@ */ Pop3 pc)
{
- FILE *f;
+ struct connection_state *scs;
int read;
char buf[BUF_SIZE];
- f = pop3Login(pc);
- if (f == NULL)
+ scs = pop3Login(pc);
+ if (scs == NULL)
return -1;
- fprintf(f, "STAT\r\n");
- fflush(f);
- fgets(buf, 256, f);
- if (buf[0] != '+') {
+ tlscomm_printf(scs, "STAT\r\n");
+ if( ! tlscomm_expect(scs, "+", buf, BUF_SIZE) ) {
POP_DM(pc, DEBUG_ERROR,
"Error Receiving Stats '%s@%s:%d'\n",
PCU.userName, PCU.serverName, PCU.serverPort);
@@ -147,20 +163,20 @@ int pop3CheckMail( /*@notnull@ */ Pop3 pc)
* We will leave it here for those servers which haven't
* caught up with the spec.
*/
- fprintf(f, "LAST\r\n");
- fflush(f);
- fgets(buf, 256, f);
+ tlscomm_printf(scs, "LAST\r\n");
+ tlscomm_gets(buf, BUF_SIZE, scs);
if (buf[0] != '+') {
/* it is not an error to receive this according to RFC 1725 */
/* no error should be returned */
pc->UnreadMsgs = pc->TotalMsgs;
+ // there's also a LIST command... not sure how to make use of it. */
} else {
sscanf(buf, "+OK %d", &read);
pc->UnreadMsgs = pc->TotalMsgs - read;
}
- fprintf(f, "QUIT\r\n");
- fclose(f);
+ tlscomm_printf(scs, "QUIT\r\n");
+ tlscomm_close(scs);
return 0;
}
@@ -193,8 +209,8 @@ int pop3Create(Pop3 pc, const char *str)
use of '@' in passwords
*/
const char *regexes[] = {
- "pop3:([^: ]{1,32}):([^@]{0,32})@([A-Za-z1-9][-A-Za-z0-9_.]+)(:[0-9]+)?( *([CcAaPp][-A-Za-z5 ]*))?$",
- "pop3:([^: ]{1,32}) ([^ ]{1,32}) ([A-Za-z1-9][-A-Za-z0-9_.]+)( [0-9]+)?( *([CcAaPp][-A-Za-z5 ]*))?$",
+ "pop3s?:([^: ]{1,32}):([^@]{0,32})@([A-Za-z1-9][-A-Za-z0-9_.]+)(:[0-9]+)?( *([CcAaPp][-A-Za-z5 ]*))?$",
+ "pop3s?:([^: ]{1,32}) ([^ ]{1,32}) ([A-Za-z1-9][-A-Za-z0-9_.]+)( [0-9]+)?( *([CcAaPp][-A-Za-z5 ]*))?$",
// "pop3:([^: ]{1,32}) ([^ ]{1,32}) ([^: ]+)( [0-9]+)? *",
// "pop3:([^: ]{1,32}):([^@]{0,32})@([^: ]+)(:[0-9]+)? *",
NULL
@@ -215,8 +231,31 @@ int pop3Create(Pop3 pc, const char *str)
"pop3:([^: ]{1,32}) ([^ ]{1,32}) ([^/: ]+)( [0-9]+)?( *(.*))?$";
}
+ if (strncmp("pop3s:", str, 6) == 0) {
+#ifdef HAVE_GNUTLS_GNUTLS_H
+ static int haveBeenWarned;
+ PCU.dossl = 1;
+ if (!haveBeenWarned) {
+ printf("wmbiff uses gnutls for TLS/SSL encryption support:\n"
+ " If you distribute software that uses gnutls, don't forget\n"
+ " to warn the users of your software that gnutls is at a\n"
+ " testing phase and may be totally insecure.\n"
+ "\nConsider yourself warned.\n");
+ haveBeenWarned = 1;
+ }
+#else
+ printf("This copy of wmbiff was not compiled with gnutls;\n"
+ "imaps is unavailable. Exiting to protect your\n"
+ "passwords and privacy.\n");
+ exit(EXIT_FAILURE);
+#endif
+ } else {
+ PCU.dossl = 0;
+ }
+
+
/* defaults */
- PCU.serverPort = 110;
+ PCU.serverPort = (PCU.dossl != 0) ? 995 : 110;
PCU.authList[0] = '\0';
for (matchedchars = 0, i = 0;
@@ -235,8 +274,15 @@ int pop3Create(Pop3 pc, const char *str)
}
// grab_authList(str + matchedchars, PCU.authList);
+ PCU.password_len = strlen(PCU.password);
+ if (PCU.password[0] == '\0') {
+ PCU.interactive_password = 1;
+ } else {
+ // ENFROB(PCU.password);
+ }
+
POP_DM(pc, DEBUG_INFO, "userName= '%s'\n", PCU.userName);
- POP_DM(pc, DEBUG_INFO, "password is %d chars long\n",
+ POP_DM(pc, DEBUG_INFO, "password is %ld chars long\n",
strlen(PCU.password));
POP_DM(pc, DEBUG_INFO, "serverName= '%s'\n", PCU.serverName);
POP_DM(pc, DEBUG_INFO, "serverPort= '%d'\n", PCU.serverPort);
@@ -254,7 +300,7 @@ int pop3Create(Pop3 pc, const char *str)
#ifdef HAVE_GCRYPT_H
-static FILE *authenticate_md5(Pop3 pc, FILE * fp, char *apop_str
+static struct connection_state *authenticate_md5(Pop3 pc, struct connection_state * scs, char *apop_str
__attribute__ ((unused)))
{
char buf[BUF_SIZE];
@@ -264,9 +310,8 @@ static FILE *authenticate_md5(Pop3 pc, FILE * fp, char *apop_str
gcry_error_t rc;
/* See if MD5 is supported */
- fprintf(fp, "AUTH CRAM-MD5\r\n");
- fflush(fp);
- fgets(buf, BUF_SIZE, fp);
+ tlscomm_printf(scs, "AUTH CRAM-MD5\r\n");
+ tlscomm_gets(buf, BUF_SIZE, scs);
POP_DM(pc, DEBUG_INFO, "%s", buf);
if (buf[0] != '+' || buf[1] != ' ') {
@@ -299,12 +344,11 @@ static FILE *authenticate_md5(Pop3 pc, FILE * fp, char *apop_str
POP_DM(pc, DEBUG_INFO, "CRAM-MD5 response: %s\n", buf);
Encode_Base64(buf, buf2);
- fprintf(fp, "%s\r\n", buf2);
- fflush(fp);
- fgets(buf, BUF_SIZE, fp);
+ tlscomm_printf(scs, "%s\r\n", buf2);
+ tlscomm_gets(buf, BUF_SIZE, scs);
if (!strncmp(buf, "+OK", 3))
- return fp; /* AUTH successful */
+ return scs; /* AUTH successful */
else {
POP_DM(pc, DEBUG_ERROR,
"CRAM-MD5 AUTH failed for user '%s@%s:%d'\n",
@@ -314,7 +358,7 @@ static FILE *authenticate_md5(Pop3 pc, FILE * fp, char *apop_str
}
}
-static FILE *authenticate_apop(Pop3 pc, FILE * fp, char *apop_str)
+static struct connection_state *authenticate_apop(Pop3 pc, struct connection_state * scs, char *apop_str)
{
gcry_md_hd_t gmh;
gcry_error_t rc;
@@ -341,12 +385,11 @@ static FILE *authenticate_apop(Pop3 pc, FILE * fp, char *apop_str)
gcry_md_close(gmh);
POP_DM(pc, DEBUG_INFO, "APOP response: %s %s\n", PCU.userName, buf);
- fprintf(fp, "APOP %s %s\r\n", PCU.userName, buf);
- fflush(fp);
- fgets(buf, BUF_SIZE, fp);
+ tlscomm_printf(scs, "APOP %s %s\r\n", PCU.userName, buf);
+ tlscomm_gets(buf, BUF_SIZE, scs);
if (!strncmp(buf, "+OK", 3))
- return fp; /* AUTH successful */
+ return scs; /* AUTH successful */
else {
POP_DM(pc, DEBUG_ERROR,
"APOP AUTH failed for user '%s@%s:%d'\n",
@@ -358,15 +401,14 @@ static FILE *authenticate_apop(Pop3 pc, FILE * fp, char *apop_str)
#endif /* HAVE_GCRYPT_H */
/*@null@*/
-static FILE *authenticate_plaintext( /*@notnull@ */ Pop3 pc,
- FILE * fp, char *apop_str
+static struct connection_state *authenticate_plaintext( /*@notnull@ */ Pop3 pc,
+ struct connection_state * scs, char *apop_str
__attribute__ ((unused)))
{
char buf[BUF_SIZE];
- fprintf(fp, "USER %s\r\n", PCU.userName);
- fflush(fp);
- if (fgets(buf, BUF_SIZE, fp) == NULL) {
+ tlscomm_printf(scs, "USER %s\r\n", PCU.userName);
+ if (tlscomm_gets(buf, BUF_SIZE, scs) == NULL) {
POP_DM(pc, DEBUG_ERROR,
"Error reading from server authenticating '%s@%s:%d'\n",
PCU.userName, PCU.serverName, PCU.serverPort);
@@ -382,14 +424,27 @@ static FILE *authenticate_plaintext( /*@notnull@ */ Pop3 pc,
return NULL;
};
- fprintf(fp, "PASS %s\r\n", PCU.password);
- fflush(fp);
- if (fgets(buf, BUF_SIZE, fp) == NULL) {
+
+ tlscomm_printf(scs, "PASS %s\r\n", PCU.password);
+ if (tlscomm_gets(buf, BUF_SIZE, scs) == NULL) {
POP_DM(pc, DEBUG_ERROR,
"Error reading from server (2) authenticating '%s@%s:%d'\n",
PCU.userName, PCU.serverName, PCU.serverPort);
return NULL;
}
+ if (strncmp(buf, "-ERR [AUTH] Password required", 20) == 0) {
+ if (PCU.interactive_password) {
+ PCU.password[0] = '\0';
+ ask_user_for_password(pc, 1); /* 1=overwrite the cache */
+ tlscomm_printf(scs, "PASS %s\r\n", PCU.password);
+ if (tlscomm_gets(buf, BUF_SIZE, scs) == NULL) {
+ POP_DM(pc, DEBUG_ERROR,
+ "Error reading from server (2) authenticating '%s@%s:%d'\n",
+ PCU.userName, PCU.serverName, PCU.serverPort);
+ return NULL;
+ }
+ }
+ }
if (buf[0] != '+') {
POP_DM(pc, DEBUG_ERROR,
"Failed password when authenticating '%s@%s:%d'\n",
@@ -399,13 +454,13 @@ static FILE *authenticate_plaintext( /*@notnull@ */ Pop3 pc,
return NULL;
};
- return fp;
+ return scs;
}
void pop3_cacheHeaders( /*@notnull@ */ Pop3 pc)
{
char buf[BUF_SIZE];
- FILE *f;
+ struct connection_state *scs;
int i;
if (pc->headerCache != NULL) {
@@ -416,8 +471,8 @@ void pop3_cacheHeaders( /*@notnull@ */ Pop3 pc)
POP_DM(pc, DEBUG_INFO, "working headers\n");
/* login the server */
- f = pop3Login(pc);
- if (!f)
+ scs = pop3Login(pc);
+ if (scs == NULL)
return;
/* pc->UnreadMsgs = pc->TotalMsgs - read; */
pc->headerCache = NULL;
@@ -429,9 +484,8 @@ void pop3_cacheHeaders( /*@notnull@ */ Pop3 pc)
m->from[0] = '\0';
POP_DM(pc, DEBUG_INFO, "search: %s", buf);
- fprintf(f, "TOP %i 0\r\n", i);
- fflush(f);
- while (fgets(buf, 256, f) && buf[0] != '.') {
+ tlscomm_printf(scs, "TOP %i 0\r\n", i);
+ while (tlscomm_gets(buf, 256, scs) && buf[0] != '.') {
if (!strncasecmp(buf, "From: ", 6)) {
/* manage the from in heads */
strncpy(m->from, buf + 6, FROM_LEN - 1);
@@ -452,9 +506,35 @@ void pop3_cacheHeaders( /*@notnull@ */ Pop3 pc)
pc->headerCache = m;
pc->headerCache->in_use = 0;
}
- fprintf(f, "QUIT\r\n");
- fflush(f);
- fclose(f);
+ tlscomm_printf(scs, "QUIT\r\n");
+ tlscomm_close(scs);
}
/* vim:set ts=4: */
+static void ask_user_for_password( /*@notnull@ */ Pop3 pc, int bFlushCache)
+{
+ /* see if we already have a password, as provided in the config file, or
+ already requested from the user. */
+ if (PCU.interactive_password) {
+ if (strlen(PCU.password) == 0) {
+ /* we need to grab the password from the user. */
+ char *password;
+ POP_DM(pc, DEBUG_INFO, "asking for password %d\n",
+ bFlushCache);
+ password =
+ passwordFor(PCU.userName, PCU.serverName, pc, bFlushCache);
+ if (password != NULL) {
+ if (strlen(password) + 1 > BUF_SMALL) {
+ DMA(DEBUG_ERROR, "Password is too long.\n");
+ memset(PCU.password, 0, BUF_SMALL - 1);
+ } else {
+ strncpy(PCU.password, password, BUF_SMALL - 1);
+ PCU.password_len = strlen(PCU.password);
+ }
+ free(password);
+ // ENFROB(PCU.password);
+ }
+ }
+ }
+}
+
diff --git a/wmbiff/gnutls-common.c b/wmbiff/gnutls-common.c
index ac84c87..a65a432 100644
--- a/wmbiff/gnutls-common.c
+++ b/wmbiff/gnutls-common.c
@@ -1,4 +1,5 @@
#include <config.h>
+# include <sys/types.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/wmbiff/passwordMgr.c b/wmbiff/passwordMgr.c
index 120df4c..131b558 100644
--- a/wmbiff/passwordMgr.c
+++ b/wmbiff/passwordMgr.c
@@ -133,7 +133,7 @@ get_password_from_keychain(Pop3 pc, const char *username,
&pwdlen, (void **) &secpwd, NULL);
if (rc != noErr) {
DM(pc, DEBUG_ERROR,
- "passmgr: keychain password grab failed, exiting\n");
+ "passmgr: keychain password grab for %s at %s failed, exiting\n", username, servername);
DM(pc, DEBUG_ERROR, "passmgr: (perhaps you pressed 'deny')\n");
/* this seems like the sanest thing to do, for now */
exit(EXIT_FAILURE);
diff --git a/wmbiff/test_tlscomm.c b/wmbiff/test_tlscomm.c
index e0a6fa2..35da322 100644
--- a/wmbiff/test_tlscomm.c
+++ b/wmbiff/test_tlscomm.c
@@ -12,8 +12,17 @@ int exists(const char *filename __attribute__ ((unused)))
{
return (0);
}
+void ProcessPendingEvents(void)
+{
+ return;
+}
+
+int x_socket(void)
+{
+ return (0);
+}
-int print_info(void *state __attribute__ ((unused)))
+int print_info(void *state __attribute__((unused)))
{
return (0);
}
diff --git a/wmbiff/test_wmbiff.c b/wmbiff/test_wmbiff.c
index 2e23f57..10ffea5 100644
--- a/wmbiff/test_wmbiff.c
+++ b/wmbiff/test_wmbiff.c
@@ -23,6 +23,16 @@
#include "tlsComm.h"
#include "charutil.h"
+void ProcessPendingEvents(void)
+{
+ return;
+}
+
+int x_socket(void)
+{
+ return (0);
+}
+
int debug_default = DEBUG_INFO;
int Relax = 1;
@@ -349,8 +359,8 @@ int test_charutil(void)
return 0;
}
-#include <netinet/in.h>
#include <sys/types.h>
+#include <netinet/in.h>
#include <sys/socket.h>
int test_sock_connect(void)
{
@@ -364,11 +374,11 @@ int test_sock_connect(void)
addr.sin_family = AF_INET;
addr.sin_addr.s_addr = 0;
addr.sin_port = 0;
- if (bind(s, &addr, sizeof(struct sockaddr_in)) < 0) {
+ if (bind(s, (const struct sockaddr *)&addr, sizeof(struct sockaddr_in)) < 0) {
perror("bind");
return 1;
}
- getsockname(s, &addr, &addrlen);
+ getsockname(s, (struct sockaddr *)&addr, &addrlen);
if (listen(s, 5) < 0) {
perror("listen");
return 1;
diff --git a/wmbiff/tlsComm.c b/wmbiff/tlsComm.c
index f1f70e7..f4896fe 100644
--- a/wmbiff/tlsComm.c
+++ b/wmbiff/tlsComm.c
@@ -29,12 +29,6 @@
#include <dmalloc.h>
#endif
-#ifdef HAVE___ATTRIBUTE__
-#define UNUSED(x) /*@unused@*/ x __attribute__((unused))
-#else
-#define UNUSED(x) x
-#endif
-
#include "tlsComm.h"
#include "Client.h" /* debugging messages */
@@ -104,18 +98,49 @@ void tlscomm_close(struct connection_state *scs)
free(scs);
}
+extern int x_socket(void);
+extern void ProcessPendingEvents(void);
+
/* this avoids blocking without using non-blocking i/o */
static int wait_for_it(int sd, int timeoutseconds)
{
fd_set readfds;
struct timeval tv;
int ready_descriptors;
- tv.tv_sec = timeoutseconds;
- tv.tv_usec = 0;
- FD_ZERO(&readfds);
- FD_SET(sd, &readfds);
+ int maxfd;
+ int xfd;
+ struct timeval time_now;
+ struct timeval time_out;
+
+ gettimeofday(&time_now, NULL);
+ memcpy(&time_out, &time_now, sizeof(struct timeval));
+ time_out.tv_sec += timeoutseconds;
+
+ xfd = x_socket();
+ maxfd = max(sd, xfd);
+
do {
- ready_descriptors = select(sd + 1, &readfds, NULL, NULL, &tv);
+ do {
+ ProcessPendingEvents();
+
+ gettimeofday(&time_now, NULL);
+ tv.tv_sec = max(time_out.tv_sec - time_now.tv_sec + 1, 0); /* sloppy, but bfd */
+ tv.tv_usec = 0;
+ /* select will return if we have X stuff or we have comm stuff on sd */
+ FD_ZERO(&readfds);
+ FD_SET(sd, &readfds);
+ // FD_SET(xfd, &readfds);
+ ready_descriptors = select(maxfd + 1, &readfds, NULL, NULL, &tv);
+ // DMA(DEBUG_INFO,
+ // "select %d/%d returned %d descriptor, %d\n",
+ // sd, timeoutseconds, ready_descriptors, FD_ISSET(sd, &readfds));
+
+ } while(tv.tv_sec > 0 && (!FD_ISSET(sd, &readfds) || (errno == EINTR && ready_descriptors == -1)));
+
+ FD_ZERO(&readfds);
+ FD_SET(sd, &readfds);
+ tv.tv_sec = 0; tv.tv_usec = 0;
+ ready_descriptors = select(sd + 1, &readfds, NULL, NULL, &tv);
}
while (ready_descriptors == -1 && errno == EINTR);
if (ready_descriptors == 0) {
@@ -381,9 +406,9 @@ static int tls_compare_certificates(const gnutls_datum * peercert)
}
-int
+static void
tls_check_certificate(struct connection_state *scs,
- const char *remote_hostname)
+ const char *remote_hostname)
{
int certstat;
const gnutls_datum *cert_list;
@@ -392,7 +417,7 @@ tls_check_certificate(struct connection_state *scs,
if (gnutls_auth_get_type(scs->tls_state) != GNUTLS_CRD_CERTIFICATE) {
bad_certificate(scs, "Unable to get certificate from peer.\n");
- return; /* bad_cert will exit if -skip-certificate-check was not given */
+ return; /* bad_cert will exit if -skip-certificate-check was not given */
}
certstat = gnutls_certificate_verify_peers(scs->tls_state);
if (certstat == GNUTLS_E_NO_CERTIFICATE_FOUND) {
@@ -412,10 +437,19 @@ tls_check_certificate(struct connection_state *scs,
"server's certificate is invalid or not X.509.\n"
"there may be a problem with the certificate stored in your certfile\n");
}
+#if defined(GNUTLS_CERT_SIGNER_NOT_FOUND)
+ } else if (certstat & GNUTLS_CERT_SIGNER_NOT_FOUND) {
+ TDM(DEBUG_INFO, "server's certificate is not signed.\n");
+ TDM(DEBUG_INFO,
+ "to verify that a certificate is trusted, use the certfile option.\n");
+#endif
+
+#if defined(GNUTLS_CERT_NOT_TRUSTED)
} else if (certstat & GNUTLS_CERT_NOT_TRUSTED) {
TDM(DEBUG_INFO, "server's certificate is not trusted.\n");
TDM(DEBUG_INFO,
"to verify that a certificate is trusted, use the certfile option.\n");
+#endif
}
if (gnutls_x509_crt_init(&cert) < 0) {
@@ -474,7 +508,7 @@ tls_check_certificate(struct connection_state *scs,
gnutls_x509_crt_deinit(cert);
TDM(DEBUG_INFO, "certificate check ok.\n");
- return (0);
+ return;
}
struct connection_state *initialize_gnutls(int sd, char *name, Pop3 pc,
diff --git a/wmbiff/tlsComm.h b/wmbiff/tlsComm.h
index eb24f7c..38911dd 100644
--- a/wmbiff/tlsComm.h
+++ b/wmbiff/tlsComm.h
@@ -57,3 +57,11 @@ void tlscomm_close( /*@only@ */ struct connection_state *scs);
/* internal function exported for testing */
int getline_from_buffer(char *readbuffer, char *linebuffer,
int linebuflen);
+#ifndef UNUSED
+#ifdef HAVE___ATTRIBUTE__
+#define UNUSED(x) /*@unused@*/ x __attribute__((unused))
+#else
+#define UNUSED(x) x
+#endif
+#endif
+
diff --git a/wmbiff/wmbiff.c b/wmbiff/wmbiff.c
index 51e7f3c..ec28119 100644
--- a/wmbiff/wmbiff.c
+++ b/wmbiff/wmbiff.c
@@ -1,4 +1,4 @@
-/* $Id: wmbiff.c,v 1.67 2004/10/01 21:02:50 bluehal Exp $ */
+/* $Id: wmbiff.c,v 1.70 2005/10/07 03:07:58 bluehal Exp $ */
// typedef int gcry_error_t;
@@ -23,6 +23,7 @@
#include <X11/Xlib.h>
#include <X11/xpm.h>
#include <X11/cursorfont.h>
+#include <X11/keysym.h>
#include <errno.h>
#include <string.h>
@@ -38,6 +39,7 @@
#include <dmalloc.h>
#endif
+
#include "wmbiff-master-led.xpm"
static char wmbiff_mask_bits[64 * 64];
static const int wmbiff_mask_width = 64;
@@ -210,6 +212,7 @@ struct path_demultiplexer {
static struct path_demultiplexer paths[] = {
{"pop3:", pop3Create},
+ {"pop3s:", pop3Create},
{"shell:", shellCreate},
{"gicu:", gicuCreate},
{"licq:", licqCreate},
@@ -217,7 +220,6 @@ static struct path_demultiplexer paths[] = {
{"imap:", imap4Create},
{"imaps:", imap4Create},
{"sslimap:", imap4Create},
- {"pop3:", pop3Create},
{"maildir:", maildirCreate},
{"mbox:", mboxCreate},
{NULL, NULL}
@@ -257,6 +259,8 @@ static int Read_Config_File(char *filename, int *loopinterval)
return 0;
}
while (!feof(fp)) {
+ /* skanky: -1 can represent an unparsed line
+ or an error */
if (ReadLine(fp, setting, value, &mbox_index) == -1)
continue;
@@ -611,6 +615,11 @@ static int wmbiffrc_permissions_check(const char *wmbiffrc_fname)
problem: if you can't find it,
neither can the bad guys.. */
}
+ if ((st.st_mode & S_IFDIR) != 0) {
+ DMA(DEBUG_ERROR, ".wmbiffrc '%s' is a directory!\n"
+ "exiting. don't do that.", wmbiffrc_fname);
+ exit(EXIT_FAILURE);
+ }
if (st.st_uid != getuid()) {
char *user = getenv("USER");
DMA(DEBUG_ERROR,
@@ -1013,11 +1022,142 @@ static void restart_wmbiff(int sig
exit(EXIT_FAILURE);
}
-static void do_biff(int argc, const char **argv)
+extern int x_socket(void)
+{
+ return ConnectionNumber(display);
+}
+extern void ProcessPendingEvents(void)
{
- unsigned int i;
static int but_pressed_region = -1; /* static so click can be determined */
int but_released_region = -1;
+ /* X Events */
+ while (XPending(display)) {
+ XEvent Event;
+ const char *press_action;
+
+ XNextEvent(display, &Event);
+
+ switch (Event.type) {
+ case Expose:
+ if (Event.xany.window != win && Event.xany.window != iconwin) {
+ msglst_redraw();
+ } else {
+ RedrawWindow();
+ }
+ break;
+ case DestroyNotify:
+ XCloseDisplay(display);
+ exit(EXIT_SUCCESS);
+ break;
+ case ButtonPress:
+ but_pressed_region =
+ CheckMouseRegion(Event.xbutton.x, Event.xbutton.y);
+ switch (Event.xbutton.button) {
+ case 1:
+ press_action = mbox[but_pressed_region].action;
+ break;
+ case 2:
+ press_action = mbox[but_pressed_region].button2;
+ break;
+ case 3:
+ press_action = mbox[but_pressed_region].fetchcmd;
+ break;
+ default:
+ press_action = NULL;
+ break;
+
+ }
+ if (press_action && strcmp(press_action, "msglst") == 0) {
+ msglst_show(&mbox[but_pressed_region],
+ Event.xbutton.x_root, Event.xbutton.y_root);
+ }
+ break;
+ case ButtonRelease:
+ but_released_region =
+ CheckMouseRegion(Event.xbutton.x, Event.xbutton.y);
+ if (but_released_region == but_pressed_region
+ && but_released_region >= 0) {
+ const char *click_action, *extra_click_action = NULL;
+
+ switch (Event.xbutton.button) {
+ case 1: /* Left mouse-click */
+ /* C-S-left will restart wmbiff. */
+ if ((Event.xbutton.state & ControlMask) &&
+ (Event.xbutton.state & ShiftMask)) {
+ restart_wmbiff(0);
+ }
+ /* do we need to run an extra action? */
+ if (mbox[but_released_region].UnreadMsgs == -1) {
+ extra_click_action =
+ mbox[but_released_region].actiondc;
+ } else if (mbox[but_released_region].UnreadMsgs > 0) {
+ extra_click_action =
+ mbox[but_released_region].actionnew;
+ } else {
+ extra_click_action =
+ mbox[but_released_region].actionnonew;
+ }
+ click_action = mbox[but_released_region].action;
+ break;
+ case 2: /* Middle mouse-click */
+ click_action = mbox[but_released_region].button2;
+ break;
+ case 3: /* Right mouse-click */
+ click_action = mbox[but_released_region].fetchcmd;
+ break;
+ default:
+ click_action = NULL;
+ break;
+ }
+ if (extra_click_action != NULL
+ && extra_click_action[0] != 0
+ && strcmp(extra_click_action, "msglst")) {
+ DM(&mbox[but_released_region], DEBUG_INFO,
+ "runing: %s", extra_click_action);
+ (void) execCommand(extra_click_action);
+ }
+ if (click_action != NULL
+ && click_action[0] != '\0'
+ && strcmp(click_action, "msglst")) {
+ DM(&mbox[but_released_region], DEBUG_INFO,
+ "running: %s", click_action);
+ (void) execCommand(click_action);
+ }
+ }
+
+ /* a button was released, hide the message list if open */
+ msglst_hide();
+
+ but_pressed_region = -1;
+ /* RedrawWindow(); */
+ break;
+ case MotionNotify:
+ break;
+ case KeyPress:{
+ XKeyPressedEvent *xkpe = (XKeyPressedEvent *) & Event;
+ KeySym ks = XKeycodeToKeysym(display, xkpe->keycode, 0);
+ if (ks > XK_0 && ks < XK_0 + min(9U, num_mailboxes)) {
+ const char *click_action = mbox[ks - XK_1].action;
+ if (click_action != NULL
+ && click_action[0] != '\0'
+ && strcmp(click_action, "msglst")) {
+ DM(&mbox[but_released_region], DEBUG_INFO,
+ "running: %s", click_action);
+ (void) execCommand(click_action);
+ }
+ }
+
+ }
+ break;
+ default:
+ break;
+ }
+ }
+}
+
+static void do_biff(int argc, const char **argv)
+{
+ unsigned int i;
time_t curtime;
int Sleep_Interval;
const char **skin_xpm = NULL;
@@ -1081,112 +1221,8 @@ static void do_biff(int argc, const char **argv)
Sleep_Interval = periodic_mail_check();
- /* X Events */
- while (XPending(display)) {
- XEvent Event;
- const char *press_action;
-
- XNextEvent(display, &Event);
-
- switch (Event.type) {
- case Expose:
- if (Event.xany.window != win &&
- Event.xany.window != iconwin) {
- msglst_redraw();
- } else {
- RedrawWindow();
- }
- break;
- case DestroyNotify:
- XCloseDisplay(display);
- exit(EXIT_SUCCESS);
- break;
- case ButtonPress:
- but_pressed_region =
- CheckMouseRegion(Event.xbutton.x, Event.xbutton.y);
- switch (Event.xbutton.button) {
- case 1:
- press_action = mbox[but_pressed_region].action;
- break;
- case 2:
- press_action = mbox[but_pressed_region].button2;
- break;
- case 3:
- press_action = mbox[but_pressed_region].fetchcmd;
- break;
- default:
- press_action = NULL;
- break;
+ ProcessPendingEvents();
- }
- if (press_action && strcmp(press_action, "msglst") == 0) {
- msglst_show(&mbox[but_pressed_region],
- Event.xbutton.x_root,
- Event.xbutton.y_root);
- }
- break;
- case ButtonRelease:
- but_released_region =
- CheckMouseRegion(Event.xbutton.x, Event.xbutton.y);
- if (but_released_region == but_pressed_region
- && but_released_region >= 0) {
- const char *click_action, *extra_click_action = NULL;
-
- switch (Event.xbutton.button) {
- case 1: /* Left mouse-click */
- /* C-S-left will restart wmbiff. */
- if ((Event.xbutton.state & ControlMask) &&
- (Event.xbutton.state & ShiftMask)) {
- restart_wmbiff(0);
- }
- /* do we need to run an extra action? */
- if (mbox[but_released_region].UnreadMsgs == -1) {
- extra_click_action =
- mbox[but_released_region].actiondc;
- } else if (mbox[but_released_region].
- UnreadMsgs > 0) {
- extra_click_action =
- mbox[but_released_region].actionnew;
- } else {
- extra_click_action =
- mbox[but_released_region].actionnonew;
- }
- click_action = mbox[but_released_region].action;
- break;
- case 2: /* Middle mouse-click */
- click_action = mbox[but_released_region].button2;
- break;
- case 3: /* Right mouse-click */
- click_action = mbox[but_released_region].fetchcmd;
- break;
- default:
- click_action = NULL;
- break;
- }
- if (extra_click_action != NULL
- && extra_click_action[0] != 0
- && strcmp(extra_click_action, "msglst")) {
- DM(&mbox[but_released_region], DEBUG_INFO,
- "runing: %s", extra_click_action);
- (void) execCommand(extra_click_action);
- }
- if (click_action != NULL
- && click_action[0] != '\0'
- && strcmp(click_action, "msglst")) {
- DM(&mbox[but_released_region], DEBUG_INFO,
- "running: %s", click_action);
- (void) execCommand(click_action);
- }
- }
-
- /* a button was released, hide the message list if open */
- msglst_hide();
-
- but_pressed_region = -1;
- /* RedrawWindow(); */
- break;
- }
- }
XSleep(Sleep_Interval);
}
while (forever); /* forever is usually true,
diff --git a/wmbiff/wmbiffrc.5 b/wmbiff/wmbiffrc.5
index 633e6e7..9917e91 100644
--- a/wmbiff/wmbiffrc.5
+++ b/wmbiff/wmbiffrc.5
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.\" $Id: wmbiffrc.5.in,v 1.17 2004/03/12 21:35:25 bluehal Exp $
+.\" $Id: wmbiffrc.5.in,v 1.18 2004/12/12 00:01:53 bluehal Exp $
.\"
.\" wmbiff/wmbiffrc.5. Generated from wmbiffrc.5.in by configure.
.\"
@@ -114,6 +114,10 @@ pop3:user:passwd at server[:port] [auth]
pop3:user passwd server[ port] [auth]
.RE
.TP
+.I pop3s
+Exactly like pop3, only uses TLS (SSL) when built with gnutls and defaults
+to port 995. This copy of WMBiff was compiled with GNUTLS.
+.TP
.I imap
These are IMAP4 boxes. As with pop3, WMBiff will report the
status of an IMAP4 mbox using the given values. This type
@@ -142,7 +146,7 @@ imap:user:passwd at server[/"mail box"][:port] [auth]
.TP
.I imaps
These are IMAP4 boxes wrapped in a TLS (SSL)
-connection. This copy of WMBiff was not compiled with GNUTLS. Parameters are the same as
+connection. This copy of WMBiff was compiled with GNUTLS. Parameters are the same as
those for ordinary IMAP4 boxes. Port defaults to 993. If
143 is specified, WMBiff will attempt to connect unencrypted
but negotiate TLS using IMAP's STARTTLS command. TLS
@@ -259,7 +263,7 @@ mailboxes as you want.
Authentication methods include "cram-md5", "apop" (for
Pop3), and "plaintext". "cram-md5" and "apop" are only
available when wmbiff is compiled with libgcrypt.
-This copy of WMBiff was not compiled with gcrypt.
+This copy of WMBiff was compiled with gcrypt.
Authentication methods are tried in the following order:
cram-md5, apop, plaintext.
diff --git a/wmbiff/wmbiffrc.5.in b/wmbiff/wmbiffrc.5.in
index beba231..812c799 100644
--- a/wmbiff/wmbiffrc.5.in
+++ b/wmbiff/wmbiffrc.5.in
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.\" $Id: wmbiffrc.5.in,v 1.17 2004/03/12 21:35:25 bluehal Exp $
+.\" $Id: wmbiffrc.5.in,v 1.18 2004/12/12 00:01:53 bluehal Exp $
.\"
.\" @configure_input@
.\"
@@ -114,6 +114,10 @@ pop3:user:passwd at server[:port] [auth]
pop3:user passwd server[ port] [auth]
.RE
.TP
+.I pop3s
+Exactly like pop3, only uses TLS (SSL) when built with gnutls and defaults
+to port 995. @GNUTLS_MAN_STATUS@
+.TP
.I imap
These are IMAP4 boxes. As with pop3, WMBiff will report the
status of an IMAP4 mbox using the given values. This type
diff --git a/wmgeneral/Makefile.in b/wmgeneral/Makefile.in
index ead0c97..b37e8ba 100644
--- a/wmgeneral/Makefile.in
+++ b/wmgeneral/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -13,80 +13,74 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
CVS2CL = @CVS2CL@
-CYGPATH_W = @CYGPATH_W@
DEFAULT_ASKPASS = @DEFAULT_ASKPASS@
-DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
GCRYPT_MAN_STATUS = @GCRYPT_MAN_STATUS@
GNUTLS_COMMON_O = @GNUTLS_COMMON_O@
GNUTLS_MAN_STATUS = @GNUTLS_MAN_STATUS@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
SKINDIR = @SKINDIR@
STRIP = @STRIP@
VERSION = @VERSION@
@@ -94,39 +88,14 @@ X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
-am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
noinst_LIBRARIES = libwmgeneral.a
libwmgeneral_a_SOURCES = list.c list.h misc.c misc.h wmgeneral.c wmgeneral.h
MAINTAINERCLEANFILES = Makefile.in
subdir = wmgeneral
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -138,7 +107,11 @@ am_libwmgeneral_a_OBJECTS = list.$(OBJEXT) misc.$(OBJEXT) \
wmgeneral.$(OBJEXT)
libwmgeneral_a_OBJECTS = $(am_libwmgeneral_a_OBJECTS)
+DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp
am__depfiles_maybe = depfiles
@AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/list.Po ./$(DEPDIR)/misc.Po \
@@ -147,8 +120,9 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = @CFLAGS@
DIST_SOURCES = $(libwmgeneral_a_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+DIST_COMMON = Makefile.am Makefile.in
SOURCES = $(libwmgeneral_a_SOURCES)
all: all-am
@@ -180,35 +154,26 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/misc.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wmgeneral.Po at am__quote@
+distclean-depend:
+ -rm -rf ./$(DEPDIR)
+
.c.o:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
- at am__fastdepCC_TRUE@ fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
.c.obj:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
- at am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
- at am__fastdepCC_TRUE@ fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
uninstall-info-am:
ETAGS = etags
ETAGSFLAGS =
-CTAGS = ctags
-CTAGSFLAGS =
-
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -234,41 +199,20 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @list='$(DISTFILES)'; for file in $$list; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,6 +237,7 @@ check: check-am
all-am: Makefile $(LIBRARIES)
installdirs:
+
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -304,7 +249,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -312,7 +257,7 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -323,10 +268,9 @@ clean: clean-am
clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
+
+distclean-am: clean-am distclean-compile distclean-depend \
+ distclean-generic distclean-tags
dvi: dvi-am
@@ -347,33 +291,25 @@ install-man:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
+
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
uninstall-am: uninstall-info-am
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-noinstLIBRARIES ctags distclean distclean-compile \
- distclean-generic distclean-tags distdir dvi dvi-am info \
- info-am install install-am install-data install-data-am \
- install-exec install-exec-am install-info install-info-am \
- install-man install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
- ps ps-am tags uninstall uninstall-am uninstall-info-am
+.PHONY: GTAGS all all-am check check-am clean clean-generic \
+ clean-noinstLIBRARIES distclean distclean-compile \
+ distclean-depend distclean-generic distclean-tags distdir dvi \
+ dvi-am info info-am install install-am install-data \
+ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic tags uninstall uninstall-am \
+ uninstall-info-am
indent:
diff --git a/wmgeneral/wmgeneral.c b/wmgeneral/wmgeneral.c
index 37720dd..88d76fe 100644
--- a/wmgeneral/wmgeneral.c
+++ b/wmgeneral/wmgeneral.c
@@ -526,12 +526,15 @@ void openXwindow(int argc, const char *argv[],
classHint.res_class = wname;
XSetClassHint(display, win, &classHint);
+ /* Was PointerMotionMask instead of KeyPressMask, but pointer motion is irrelevant,
+ and if the user went to the trouble of giving us keypresses, the least we can do
+ is handle em... */
XSelectInput(display, win,
ButtonPressMask | ExposureMask | ButtonReleaseMask |
- PointerMotionMask | StructureNotifyMask);
+ KeyPressMask | StructureNotifyMask);
XSelectInput(display, iconwin,
ButtonPressMask | ExposureMask | ButtonReleaseMask |
- PointerMotionMask | StructureNotifyMask);
+ KeyPressMask | StructureNotifyMask);
/* wname is argv[0] */
if (XStringListToTextProperty(&wname, 1, &name) == 0) {
--
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