diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2014-12-07 19:42:37 -0700 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2014-12-07 19:42:37 -0700 |
| commit | 20d433c77e32dc05c2accf8ab943c2a7d9738239 (patch) | |
| tree | 4cf7be2b55ec529067a2867eb29ebcfe6c5758aa /imap/src/osdep/unix | |
| parent | 121a42f3d82c1b98c384857960d14b2057a95c41 (diff) | |
| download | alpine-20d433c77e32dc05c2accf8ab943c2a7d9738239.tar.xz | |
* new version 2.19.9993
* Aggregate operations allows bouncing a list of messages using a role.
Suggested by Ulf-Dietrich Braumann.
* Compilation error of module pith/reply.c if SMIME is not defined (as in
Windows Alpine). There was a misplaced parenthesis.
* Update to S/MIME to explain how to use a PKCS12 certificate in
Alpine.
* Fix error in compare_certs function, that would modify the name of
the certificates after sorting them, and return when no certificates
are given.
* When replying to several messages, subject will be decoded first,
and then stripped from re/fwd before they are compared to determine
the subject of the replied message.
* Add $(LIBINTL) to the flags to link rpdump, rpload, alpined and
alpineldap because MAC OSX 10.8 x86_64 needs it.
* When the download of an attachment is interrumpted, Alpine stills
caches what was downloaded, making the download incomplete for
subsequent calls of Alpine attempting to open the attachment. In the
future, Alpine will not cache any downloaded part of the attachment
when it is interrupted.
Diffstat (limited to 'imap/src/osdep/unix')
| -rw-r--r-- | imap/src/osdep/unix/Makefile | 3 | ||||
| -rw-r--r-- | imap/src/osdep/unix/env_unix.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/imap/src/osdep/unix/Makefile b/imap/src/osdep/unix/Makefile index a38d15fb..14975c82 100644 --- a/imap/src/osdep/unix/Makefile +++ b/imap/src/osdep/unix/Makefile @@ -110,6 +110,7 @@ LOCKPGM= LOCKPGM1=/usr/libexec/mlock LOCKPGM2=/usr/sbin/mlock LOCKPGM3=/etc/mlock +LOCKPGM4=/usr/bin/mlock # Default formats for creating new mailboxes and for empty mailboxes in the @@ -984,7 +985,7 @@ onceenv: -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \ -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" \ -DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \ - -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS + -DLOCKPGM3=\"$(LOCKPGM3)\" -DLOCKPGM4=\"$(LOCKPGM4)\" > OSCFLAGS echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE echo $(OS) > OSTYPE diff --git a/imap/src/osdep/unix/env_unix.c b/imap/src/osdep/unix/env_unix.c index b13d5066..d1bb1f02 100644 --- a/imap/src/osdep/unix/env_unix.c +++ b/imap/src/osdep/unix/env_unix.c @@ -1203,7 +1203,8 @@ long dotlock_lock (char *file,DOTLOCK *base,int fd) if (closedBox || !lockpgm); /* can't do on closed box or disabled */ else if ((*lockpgm && stat (lockpgm,&sb)) || (!*lockpgm && stat (lockpgm = LOCKPGM1,&sb) && - stat (lockpgm = LOCKPGM2,&sb) && stat (lockpgm = LOCKPGM3,&sb))) + stat (lockpgm = LOCKPGM2,&sb) && stat (lockpgm = LOCKPGM3,&sb) && + stat (lockpgm = LOCKPGM4,&sb))) lockpgm = NIL; /* disable if can't find lockpgm */ else if (pipe (pi) >= 0) { /* make command pipes */ long cf; |