sync with update-patches
This commit is contained in:
brad
parent
fba8bc2120
commit
713b15135c
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-doc_tech-notes_txt,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
--- doc/tech-notes.txt.orig Wed Apr 16 14:26:24 2003
|
||||
+++ doc/tech-notes.txt Tue May 27 12:17:11 2003
|
||||
@@ -332,14 +332,14 @@ SMTP and Sendmail
|
||||
$OpenBSD: patch-doc_tech-notes_txt,v 1.3 2003/05/30 20:44:34 brad Exp $
|
||||
--- doc/tech-notes.txt.orig Thu May 29 15:41:12 2003
|
||||
+++ doc/tech-notes.txt Fri May 30 16:41:24 2003
|
||||
@@ -333,14 +333,14 @@ SMTP and Sendmail
|
||||
sendmail-path, smtp-server, and compile-time options. The first
|
||||
MTA specified in the following list is used:
|
||||
|
||||
@ -20,7 +20,7 @@ $OpenBSD: patch-doc_tech-notes_txt,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
9. DF_SENDMAIL_PATH defined at compile time.
|
||||
10. SENDMAIL and SENDMAILFLAGS defined at compile time.
|
||||
|
||||
@@ -663,20 +663,20 @@ Compile-time Options
|
||||
@@ -664,20 +664,20 @@ Compile-time Options
|
||||
SENDMAIL
|
||||
SENDMAILFLAGS
|
||||
Sets the name and flags for the local program that will be
|
||||
@ -44,7 +44,7 @@ $OpenBSD: patch-doc_tech-notes_txt,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
|
||||
There are a couple of more obscure options which are in the source
|
||||
code because a few people have asked for them or because we changed
|
||||
@@ -870,24 +870,24 @@ Installing Pine and Pico on UNIX Platfor
|
||||
@@ -871,24 +871,24 @@ Installing Pine and Pico on UNIX Platfor
|
||||
Installing _Pine_ and _Pico_ is remarkably simple. You take the
|
||||
program files which you have just transferred or built and you move
|
||||
them to the correct directory on your system. Most often the binaries
|
||||
@ -84,7 +84,7 @@ $OpenBSD: patch-doc_tech-notes_txt,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
_________________________________________________________________
|
||||
|
||||
Installing PC-Pine
|
||||
@@ -940,13 +940,14 @@ Installing IMAPd
|
||||
@@ -941,13 +941,14 @@ Installing IMAPd
|
||||
|
||||
When the _Pine_ distribution is built on a UNIX system, the IMAP
|
||||
server binary, imapd, is compiled. Installing imapd requires placing
|
||||
@ -102,7 +102,7 @@ $OpenBSD: patch-doc_tech-notes_txt,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
|
||||
The /etc/inetd.conf file entry may vary on different versions of UNIX.
|
||||
Some have a slightly different set of fields. Also the pathname in
|
||||
@@ -975,11 +976,11 @@ Support Files and Environment Variables:
|
||||
@@ -976,11 +977,11 @@ Support Files and Environment Variables:
|
||||
This section lists the various files which _Pine_ uses which are not
|
||||
email folders. All of these are the default names of files, they may
|
||||
vary based on _Pine_'s configuration.
|
||||
@ -117,7 +117,7 @@ $OpenBSD: patch-doc_tech-notes_txt,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
Local pointer to system administrator.
|
||||
~/.pinerc
|
||||
Personal configuration file for each user.
|
||||
@@ -1199,10 +1200,10 @@ Pine
|
||||
@@ -1200,10 +1201,10 @@ Pine
|
||||
Configuration: Prints a sample system configuration file to the
|
||||
screen or standard output. To generate an initial system
|
||||
configuration file, execute
|
||||
@ -130,7 +130,7 @@ $OpenBSD: patch-doc_tech-notes_txt,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
A system configuration file is not required.
|
||||
-convert_sigs _-p pinerc_
|
||||
Convert signatures contained in signature files into literal
|
||||
@@ -1312,9 +1313,9 @@ Pine
|
||||
@@ -1313,9 +1314,9 @@ Pine
|
||||
configuration folder.
|
||||
-P _pinerc_
|
||||
Uses the named file as the system wide configuration file
|
||||
@ -143,7 +143,7 @@ $OpenBSD: patch-doc_tech-notes_txt,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
-passfile _passfile_
|
||||
This tells _Pine_ what file should be used as the password
|
||||
file. This should be a fully-qualified filename.
|
||||
@@ -1518,8 +1519,8 @@ Pine Configuration
|
||||
@@ -1519,8 +1520,8 @@ Pine Configuration
|
||||
configuration. In most cases, the compiled-in preferences will suit
|
||||
users and administrators just fine. When running _Pine_ on a UNIX
|
||||
system, the default built-in configuration can be changed by setting
|
||||
@ -154,7 +154,7 @@ $OpenBSD: patch-doc_tech-notes_txt,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
the definitions for SYSTEM_PINERC and SYSTEM_PINERC_FIXED in
|
||||
pine/osdep/os-xxx.h are set to.) The location of the pine.conf file
|
||||
can be changed with the -P command line argument. Both _Pine_ and
|
||||
@@ -3316,7 +3317,7 @@ General Configuration Variables
|
||||
@@ -3318,7 +3319,7 @@ General Configuration Variables
|
||||
spell checker. If your Unix system has _ispell_ it is probably
|
||||
reasonable to make it the default speller by configuring it as
|
||||
the default in the system configuration file,
|
||||
@ -163,7 +163,7 @@ $OpenBSD: patch-doc_tech-notes_txt,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
If this option is not set, then the system's _spell_ command is
|
||||
used. The spell command does not work the same as the alternate
|
||||
speller. It produces a list of misspelled words on its standard
|
||||
@@ -3338,7 +3339,7 @@ General Configuration Variables
|
||||
@@ -3340,7 +3341,7 @@ General Configuration Variables
|
||||
set to zero ssh connections will be completely disabled.
|
||||
_ssh-path_
|
||||
Sets the name of the command used to open a UNIX secure shell
|
||||
@ -172,7 +172,7 @@ $OpenBSD: patch-doc_tech-notes_txt,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
_standard-printer_
|
||||
System-wide configuration file only. Specifies a list of
|
||||
commands for category 2 of the _Setup/Printer_ screen, the
|
||||
@@ -3582,11 +3583,11 @@ General Configuration Variables
|
||||
@@ -3584,11 +3585,11 @@ General Configuration Variables
|
||||
Now for an example:
|
||||
|
||||
url-viewers=_TEST("test -n '${DISPLAY}'")_ /usr/local/bin/netscape,
|
||||
@ -186,7 +186,7 @@ $OpenBSD: patch-doc_tech-notes_txt,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
exist. If it doesn't, then the final path and file must exist.
|
||||
Note that the last entry is a DOS/Windows path. This is one way
|
||||
to support _Pine_ running on more than one architecture with
|
||||
@@ -8378,10 +8379,10 @@ Configuration Inheritance
|
||||
@@ -8385,10 +8386,10 @@ Configuration Inheritance
|
||||
5. the system-wide _fixed_ configuration file (Unix _Pine_ only)
|
||||
|
||||
The fixed configuration file is normally
|
||||
@ -199,7 +199,7 @@ $OpenBSD: patch-doc_tech-notes_txt,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
_PC-Pine_. For _PC-Pine_, if the environment variable _$PINECONF_ is
|
||||
set, that is used for the system-wide configuration. This location can
|
||||
be set or changed on the command line with the -P flag. The
|
||||
@@ -8535,17 +8536,16 @@ SMTP Servers
|
||||
@@ -8633,17 +8634,16 @@ SMTP Servers
|
||||
* A program that implements the SMTP or ESMTP protocol via stdio.
|
||||
* An entry in /etc/services for the alternate service.
|
||||
* An entry in /etc/inetd.conf for the alternate service.
|
||||
@ -221,7 +221,7 @@ $OpenBSD: patch-doc_tech-notes_txt,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
|
||||
In DOS and OS/2, _Pine_ looks in the same directory as the PINERC file
|
||||
and the same dir as PINE.EXE. This is similar to the UNIX situation
|
||||
@@ -9720,7 +9720,7 @@ Printers and Printing
|
||||
@@ -9818,7 +9818,7 @@ Printers and Printing
|
||||
|
||||
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
|
||||
@ -230,7 +230,7 @@ $OpenBSD: patch-doc_tech-notes_txt,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
|
||||
The third selection is the user's personal choice for a UNIX print
|
||||
command. The text to be printed is piped into the command. _Enscript_
|
||||
@@ -10174,9 +10174,9 @@ Test Checklist
|
||||
@@ -10272,9 +10272,9 @@ Test Checklist
|
||||
Error messages for incorrect terminal types (try "foo" and
|
||||
"vt52")
|
||||
___
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-pine_mailcap_c,v 1.1 2002/12/01 20:57:10 jakob Exp $
|
||||
--- pine/mailcap.c.orig Mon Nov 18 22:47:22 2002
|
||||
+++ pine/mailcap.c Sun Dec 1 15:17:46 2002
|
||||
@@ -921,14 +921,18 @@ mc_cmd_bldr(controlstring, type, subtype
|
||||
$OpenBSD: patch-pine_mailcap_c,v 1.2 2003/05/30 20:44:34 brad Exp $
|
||||
--- pine/mailcap.c.orig Mon Apr 28 21:10:42 2003
|
||||
+++ pine/mailcap.c Fri May 30 16:41:24 2003
|
||||
@@ -919,14 +919,18 @@ mc_cmd_bldr(controlstring, type, subtype
|
||||
* have to put those outside of the single quotes.
|
||||
* (The parm+1000 nonsense is to protect against
|
||||
* malicious mail trying to overlow our buffer.)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-pine_pine_hlp,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
--- pine/pine.hlp.orig Wed Apr 16 02:22:36 2003
|
||||
+++ pine/pine.hlp Tue May 27 12:17:11 2003
|
||||
@@ -830,9 +830,9 @@ Unix Pine:
|
||||
$OpenBSD: patch-pine_pine_hlp,v 1.3 2003/05/30 20:44:34 brad Exp $
|
||||
--- pine/pine.hlp.orig Thu May 29 14:10:13 2003
|
||||
+++ pine/pine.hlp Fri May 30 16:41:24 2003
|
||||
@@ -969,9 +969,9 @@ Unix Pine:
|
||||
executable <Unix search path>/pine
|
||||
persnl cfg ~/.pinerc
|
||||
except cfg ~/.pinercex
|
||||
@ -14,7 +14,7 @@ $OpenBSD: patch-pine_pine_hlp,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
|
||||
interrupted ~/.pine-interrupted-mail
|
||||
debug ~/.pine-debugN
|
||||
@@ -844,8 +844,7 @@ Unix Pine:
|
||||
@@ -983,8 +983,7 @@ Unix Pine:
|
||||
postponed# ~/mail/postponed-msgs
|
||||
sentmail# ~/mail/sent-mail
|
||||
mailcap# ~/.mailcap + /etc/mailcap
|
||||
@ -24,7 +24,7 @@ $OpenBSD: patch-pine_pine_hlp,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
|
||||
news-spool varies across Unix flavors, e.g. /usr/spool/news or /var/news
|
||||
active-news varies across Unix flavors, e.g. /usr/lib/news/active
|
||||
@@ -1264,9 +1263,9 @@ contact email address may have been set
|
||||
@@ -1409,9 +1408,9 @@ contact email address may have been set
|
||||
this link now to send a message to it:<BR>
|
||||
<A HREF="X-Pine-Gripe:_LOCAL_ADDRESS_?local"><!--#echo var="_LOCAL_FULLNAME_"--></A><P>
|
||||
<!--chtml endif-->
|
||||
@ -36,7 +36,7 @@ $OpenBSD: patch-pine_pine_hlp,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
<HR WIDTH="75%">
|
||||
<!--chtml endif-->
|
||||
<P>
|
||||
@@ -1354,7 +1353,7 @@ To Exit this screen and continue your Pi
|
||||
@@ -1499,7 +1498,7 @@ To Exit this screen and continue your Pi
|
||||
<OL>
|
||||
<LI> <A HREF="#intro">Introduction</A>
|
||||
<LI> <A HREF="#pine_help">Pine Help</A>
|
||||
@ -45,7 +45,7 @@ $OpenBSD: patch-pine_pine_hlp,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
<LI> <A HREF="#local_support">Local Support Contacts</A>
|
||||
<!--chtml endif-->
|
||||
<LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>
|
||||
@@ -1466,9 +1465,9 @@ copy of Pine you are using has been prop
|
||||
@@ -1611,9 +1610,9 @@ copy of Pine you are using has been prop
|
||||
at your site.)
|
||||
|
||||
|
||||
@ -57,7 +57,7 @@ $OpenBSD: patch-pine_pine_hlp,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
<!--chtml endif-->
|
||||
|
||||
<H2><A NAME="giving_cmds">Giving Commands in Pine</A></H2>
|
||||
@@ -2152,7 +2151,7 @@ screen or standard output. To generate a
|
||||
@@ -2299,7 +2298,7 @@ screen or standard output. To generate a
|
||||
file, execute
|
||||
|
||||
<PRE><CODE>
|
||||
@ -66,7 +66,7 @@ $OpenBSD: patch-pine_pine_hlp,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
</CODE></PRE>
|
||||
<P>
|
||||
|
||||
@@ -2160,7 +2159,7 @@ To generate a system configuration file
|
||||
@@ -2307,7 +2306,7 @@ To generate a system configuration file
|
||||
system configuration file, execute
|
||||
|
||||
<PRE><CODE>
|
||||
@ -75,7 +75,7 @@ $OpenBSD: patch-pine_pine_hlp,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
</CODE></PRE>
|
||||
<P>
|
||||
A system configuration file is not required.
|
||||
@@ -2325,7 +2324,7 @@ Pinerc may be either a local file or a r
|
||||
@@ -2472,7 +2471,7 @@ Pinerc may be either a local file or a r
|
||||
<DT> -P <EM>pinerc</EM>
|
||||
|
||||
<DD> Uses the named file as the system wide configuration file instead of
|
||||
@ -84,7 +84,7 @@ $OpenBSD: patch-pine_pine_hlp,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
Pinerc may be either a local file or a remote configuration folder.
|
||||
<P>
|
||||
|
||||
@@ -3051,10 +3050,10 @@ In increasing order of precedence they a
|
||||
@@ -3200,10 +3199,10 @@ In increasing order of precedence they a
|
||||
</OL>
|
||||
<P>
|
||||
The fixed configuration file is normally
|
||||
@ -97,7 +97,7 @@ $OpenBSD: patch-pine_pine_hlp,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
set for PC-Pine.
|
||||
For PC-Pine, if the environment variable <EM>$PINECONF</EM> is set, that
|
||||
is used for the system-wide configuration.
|
||||
@@ -16017,7 +16016,7 @@ a semi-colon (;) under Windows; for exam
|
||||
@@ -16222,7 +16221,7 @@ a semi-colon (;) under Windows; for exam
|
||||
</PRE>
|
||||
<!--chtml else-->
|
||||
a colon (:) under UNIX; for example:<PRE>
|
||||
@ -106,7 +106,7 @@ $OpenBSD: patch-pine_pine_hlp,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
</PRE>
|
||||
<!--chtml endif-->
|
||||
<P><UL>
|
||||
@@ -18813,7 +18812,7 @@ the fourth is for the connection method
|
||||
@@ -19021,7 +19020,7 @@ the fourth is for the connection method
|
||||
<H1>OPTION: ssh-path</H1>
|
||||
|
||||
Sets the name of the command used to open a UNIX secure shell
|
||||
@ -115,7 +115,7 @@ $OpenBSD: patch-pine_pine_hlp,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
<P>
|
||||
<UL>
|
||||
<LI><A HREF="h_finding_help">Finding more information and requesting help</A>
|
||||
@@ -20196,7 +20195,7 @@ argument (see the "lynx" examp
|
||||
@@ -20404,7 +20403,7 @@ argument (see the "lynx" examp
|
||||
So, here are some example entries:
|
||||
<PRE>
|
||||
url-viewers = _TEST("test -n '${DISPLAY}'")_ /usr/local/bin/netscape
|
||||
@ -124,7 +124,7 @@ $OpenBSD: patch-pine_pine_hlp,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
C:\BIN\NETSCAPE.BAT
|
||||
</PRE>
|
||||
<P>
|
||||
@@ -20204,7 +20203,7 @@ This example shows that for the first vi
|
||||
@@ -20412,7 +20411,7 @@ This example shows that for the first vi
|
||||
the environment variable "DISPLAY" must be defined. If it
|
||||
is, then the path and file "/usr/local/bin/netscape" must exist.
|
||||
If neither condition is met,
|
||||
@ -133,7 +133,7 @@ $OpenBSD: patch-pine_pine_hlp,v 1.2 2003/05/27 23:38:33 brad Exp $
|
||||
If it does, then the "_URL_" token is replaced by the selected URL.
|
||||
If the path to "lynx" is invalid,
|
||||
then the final path and file C:\BIN\NETSCAPE.BAT must exist.
|
||||
@@ -20300,7 +20299,7 @@ because of its length, but should all ap
|
||||
@@ -20508,7 +20507,7 @@ because of its length, but should all ap
|
||||
url-viewers = _TEST("test -L /myhomedir/.netscape/lock")_ "/usr/local/bin/netscape -remote 'openURL(_URL_, new-window)' &"<BR>
|
||||
|
||||
_TEST("test -n '${DISPLAY}'")_ "/usr/local/bin/netscape &"<BR>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user