/usr/local/lib/pine.conf.fixed
+/etc/pine.conf.fixed
/usr/local/pine.conf.fixed
@@ -141,9 +141,9 @@
.pinerc file.
-/usr/local/lib/pine.conf
+/etc/pine.conf
-/usr/local/pine.conf
+/etc/pine.conf
DF_SENDMAIL_PATH defined at compile time.
--- a/doc/tech-notes/config-notes.html
+++ b/doc/tech-notes/config-notes.html
@@ -931,10 +931,10 @@
The fixed configuration file is normally
-/usr/local/lib/pine.conf.fixed.
+/etc/pine.conf.fixed.
The system-wide configuration file is normally
-/usr/local/lib/pine.conf for Unix Alpine and is normally not
+/etc/pine.conf for Unix Alpine and is normally not
set for PC-Alpine.
For PC-Alpine, if the environment variable $PINECONF is set, that
is used for the system-wide configuration.
@@ -1252,8 +1252,8 @@
/etc/inetd.conf for the alternate service.
-/usr/local/lib/pine.conf,
-/usr/local/lib/pine.conf.fixed or ~/.pinerc.
+/etc/pine.conf,
+/etc/pine.conf.fixed or ~/.pinerc.
--- a/doc/tech-notes/config.html
+++ b/doc/tech-notes/config.html
@@ -7,8 +7,8 @@
configuration. In most cases, the compiled-in preferences will suit users
and administrators just fine. When running Alpine on a UNIX system, the
default built-in configuration can be changed by setting variables in the
-system configuration files, /usr/local/lib/pine.conf
-or /usr/local/lib/pine.conf.fixed.
+system configuration files, /etc/pine.conf
+or /etc/pine.conf.fixed.
(Actually, these files can be changed using the configure arguments
--with-system-pinerc=VALUE or --with-system-fixed-pinerc=VALUE.)
The location of the pine.conf file can be changed with the -P command line
@@ -2326,7 +2326,7 @@
/usr/spool/news.
+path is usually /var/spool/news.
/usr/local/lib/pine.conf.
+system configuration file, /etc/pine.conf.
If this option is not set, then the system's spell command is used.
--- a/doc/tech-notes/installation.html
+++ b/doc/tech-notes/installation.html
@@ -227,8 +227,8 @@
There are three optional auxiliary files:
/usr/local/lib/pine.info,
-/usr/local/lib/pine.conf, and
-/usr/local/lib/pine.conf.fixed. The file
+/etc/pine.conf, and
+/etc/pine.conf.fixed. The file
pine.info contains text on how to get further help on the
local system. It is part of the help text for the
main menu and should probably refer to the local help desk or the system
@@ -318,11 +318,11 @@
/usr/local/lib/pine.conf
+Reading of /etc/pine.conf
/usr/local/lib/pine.conf.fixed
+Fixing variables and features in /etc/pine.conf.fixed
- alpine -conf > /usr/local/lib/pine.conf
+ alpine -conf > /etc/pine.conf
@@ -95,7 +95,7 @@ system configuration file, execute
- alpine -P old-pine.conf -conf > /usr/local/lib/pine.conf
+ alpine -P old-pine.conf -conf > /etc/pine.conf
A system configuration file is not required. @@ -258,7 +258,7 @@
--- a/doc/tech-notes/low-level.html
+++ b/doc/tech-notes/low-level.html
@@ -787,7 +787,7 @@
The second selection is the standard UNIX print command. The default is
lpr, but it can be changed on a system basis to anything so
-desired in /usr/local/lib/pine.conf.
+desired in /etc/pine.conf.
The third selection is
the user's personal choice for a UNIX print command. The text to be
debian/patches/20_barry_defreese_hurd_build_fix.patch 0000644 0000000 0000000 00000000375 12146256256 020205 0 ustar --- a/configure
+++ b/configure
@@ -18733,7 +18733,7 @@
case "$host" in
- *-linux-gnu*|*-k*bsd*-gnu*)
+ *-linux-gnu*|*-k*bsd*-gnu*|*-*-gnu*)
alpine_path_delim="/"
alpine_mode_readonly="(0600)"
if test -f /etc/fedora-release ; then
debian/patches/10_alpine_1.10_spooldir.patch 0000644 0000000 0000000 00000006362 12146256256 016000 0 ustar --- a/imap/docs/imaprc.txt
+++ b/imap/docs/imaprc.txt
@@ -168,8 +168,8 @@
Sets the directory in which the user's data can be found. A user's
folders can be found in a subdirectory of the black box directory
named with the user's username. For example, if the blackbox
- directory is /usr/spool/folders/, user jones' data can be found
- in /usr/spool/folders/jones/. The user's black-box directory is
+ directory is /var/spool/folders/, user jones' data can be found
+ in /var/spool/folders/jones/. The user's black-box directory is
the location of folders, .mminit, .imaprc, .newsrc, and all other
files used by c-client; internally, it sets c-client's idea of the
user's ``home directory'', overriding /etc/passwd.
@@ -411,14 +411,14 @@
If non-zero, a warning message is given if an attempt to create a
lock file fails. Otherwise, EACCES is treated as a "silent failure",
and it proceeds without trying to use the lock file. This is for
- the benefit of users on systems with paranoid /usr/spool/mail
- protections which don't let users create /usr/spool/mail/$(USER).lock
+ the benefit of users on systems with paranoid /var/spool/mail
+ protections which don't let users create /var/spool/mail/$(USER).lock
files; these unfortunate users would be harassed with a flood of
error messages otherwise. The problem is that on SVR4, if EACCES
remains disabled and fcntl() locking is also disabled, then there is
no locking at all which is doubleplus-ungood.
- If the site is paranoid on /usr/spool/mail protections AND if there
+ If the site is paranoid on /var/spool/mail protections AND if there
is no fcntl() locking (SVR4) or usable flock() locking (e.g. NFS),
then there is no way to win. Find a different system to use.
--- a/imap/docs/locking.txt
+++ b/imap/docs/locking.txt
@@ -255,7 +255,7 @@
timeout for this lock, after which it is broken on the presumption
that it is a stale lock. If it can not create the .lock file due to
an EACCES (protection failure) error, it once silently proceeded
-without this lock; this was for systems which protect /usr/spool/mail
+without this lock; this was for systems which protect /var/spool/mail
from unprivileged processes creating files. Today, c-client reports
an error unless it is built otherwise. The purpose of this lock is to
prevent against unfavorable interactions with mail delivery.
@@ -278,7 +278,7 @@
Mail delivery daemons use lock (1), (2), or both. Lock (1) works
over NFS; lock (2) is the only one that works on sites that protect
-/usr/spool/mail against unprivileged file creation. Prudent mail
+/var/spool/mail against unprivileged file creation. Prudent mail
delivery daemons use both forms of locking, and of course so does
c-client.
@@ -335,7 +335,7 @@
the mail file is NFS-mounted.
What this means is that there is *no* locking protection at all
-in the case of a client using an NFS-mounted /usr/spool/mail that does
+in the case of a client using an NFS-mounted /var/spool/mail that does
not permit file creation by unprivileged programs. It is impossible,
under these circumstances, for an unprivileged program to do anything
about it. Worse, if EACCES errors on .lock file creation are no-op'ed
debian/patches/60_fix_string_error.patch 0000644 0000000 0000000 00000003320 12146256256 015537 0 ustar Index: alpine-2.02/imap/src/osdep/unix/flocklnx.c
===================================================================
--- alpine-2.02.orig/imap/src/osdep/unix/flocklnx.c 2010-10-02 04:37:57.000000000 -0400
+++ alpine-2.02/imap/src/osdep/unix/flocklnx.c 2011-11-11 08:58:18.297338885 -0500
@@ -57,7 +57,7 @@
case ENOLCK: /* lock table is full */
sprintf (tmp,"File locking failure: %s",strerror (errno));
mm_log (tmp,WARN); /* give the user a warning of what happened */
- if (!logged++) syslog (LOG_ERR,tmp);
+ if (!logged++) syslog (LOG_ERR, "%s", tmp);
/* return failure if non-blocking lock */
if (op & LOCK_NB) return -1;
sleep (5); /* slow down in case it loops */
Index: alpine-2.02/alpine/mailcmd.c
===================================================================
--- alpine-2.02.orig/alpine/mailcmd.c 2010-10-02 04:37:57.000000000 -0400
+++ alpine-2.02/alpine/mailcmd.c 2011-11-11 09:02:29.357346728 -0500
@@ -7879,7 +7879,7 @@
case 13 : /* Match my addresses */
me++;
- snprintf(sstring, sizeof(sstring), not ? _(dont_match_me) : _(match_me));
+ snprintf(sstring, sizeof(sstring), "%s", not ? _(dont_match_me) : _(match_me));
continue;
case 14 : /* Subject: default */
Index: alpine-2.02/pith/ldap.c
===================================================================
--- alpine-2.02.orig/pith/ldap.c 2010-10-02 04:37:57.000000000 -0400
+++ alpine-2.02/pith/ldap.c 2011-11-11 09:02:03.401345919 -0500
@@ -777,7 +777,7 @@
*/
switch(args){
case 0:
- snprintf(filter, sizeof(filter), filt_format);
+ snprintf(filter, sizeof(filter), "%s", filt_format);
break;
case 1:
snprintf(filter, sizeof(filter), filt_format, scp);
debian/patches/80_remove_phone_home.patch 0000644 0000000 0000000 00000030154 12146277105 015653 0 ustar From 01674610679e4af4a6c6d890659573133609cec5 Mon Sep 17 00:00:00 2001
From: Geoffrey Thomas
-
-SPECIAL REQUEST:
-This software is made available as a public service of the
-University of Washington in Seattle. We are no longer actively developing
-the software, but it is still helpful to us to have an idea of how many
-people are using Alpine. Are you willing to be counted as an Alpine user? Pressing
-Return
-will send an anonymous (meaning, your real email address will not be revealed)
-message to the Alpine team at the University of Washington for purposes of tallying.
-
-
-
To Exit this screen and continue your Alpine session press "Return".
We hope you will explore Alpine's many capabilities. From the MAIN MENU,
select Setup/Config to see many of the options available to you. Also note
that all screens have context-sensitive help text available.