pkgsrc/net/uucp/patches/patch-af
jlam c1009ac844 Merge improvements from the version of Taylor UUCP 1.06.1 that exists
in NetBSD's src/gnu/libexec/uucp directory.  Changes include:

   * Teaching cu(1) about hardware flow control.
   * Make cu(1) honor "echocheck" and "binary mode" with respect to
     inspecting the data stream for newlines.
   * Make some proper integer casts so as not to break on LP64 platforms.
   * Teach uucp to substitute for \H with the IP address of the system.
   * Avoid potential divide-by-zero errors when computing times using
     serial rates.
   * Properly initialize some variables.

The main difference between this version and the one in NetBSD is the
location of uucico, uuconv, and uuxqt -- the vanilla UUCP location is
${PREFIX}/sbin while the NetBSD location is /usr/libexec/uucp.

Bump PKGREVISION to 1.
2006-10-30 03:33:59 +00:00

164 lines
5.9 KiB
Text
Raw Blame History

This file contains invisible Unicode characters

This file contains invisible Unicode characters that are indistinguishable to humans but may be processed differently by a computer. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

$NetBSD: patch-af,v 1.1 2006/10/30 03:33:59 jlam Exp $
--- policy.h.orig 2003-05-29 02:08:45.000000000 -0400
+++ policy.h
@@ -30,6 +30,9 @@
/* System characteristics. */
+/* Local system configuration */
+#include "policy_local.h"
+
/* This code tries to use several ANSI C features, including
prototypes, stdarg.h, the const qualifier and the types void
(including void * pointers) and unsigned char. By default it will
@@ -202,7 +205,9 @@
HAVE_SAVED_SETUID to 1, but your system does not have saved set
user ID, uucp will fail with an error message whenever anybody
other than the uucp user uses it. */
+#ifndef HAVE_SAVED_SETUID
#define HAVE_SAVED_SETUID 1
+#endif
/* On some systems, such as 4.4BSD-Lite, NetBSD, the DG Aviion and,
possibly, the RS/6000, the setreuid function is broken. It should
@@ -212,7 +217,9 @@
such a system you must set HAVE_BROKEN_SETREUID to 1; if you do
not, you will get error messages from setreuid. Systems on which
setreuid exists but is broken pretty much always have saved setuid. */
+#ifndef HAVE_BROKEN_SETREUID
#define HAVE_BROKEN_SETREUID 0
+#endif
/* On a few systems, such as NextStep 3.3, the POSIX macro F_SETLKW is
defined, but does not work. On such systems, you must set
@@ -240,8 +247,10 @@
the sendmail choice below. Otherwise, select one of the other
choices as appropriate. */
#if 1
+#ifndef MAIL_PROGRAM
#define MAIL_PROGRAM "/usr/lib/sendmail -t"
/* #define MAIL_PROGRAM "/usr/sbin/sendmail -t" */
+#endif
#define MAIL_PROGRAM_TO_BODY 1
#define MAIL_PROGRAM_SUBJECT_BODY 1
#endif
@@ -466,8 +475,8 @@
When looking something up (a system, a port, etc.) the new style
configuration files will be read first, followed by the V2
configuration files, followed by the HDB configuration files. */
-#define HAVE_V2_CONFIG 0
-#define HAVE_HDB_CONFIG 0
+#define HAVE_V2_CONFIG 1
+#define HAVE_HDB_CONFIG 1
/* Exactly one of the following macros must be set to 1. The exact
format of the spool directories is explained in unix/spool.c.
@@ -572,16 +581,20 @@
/* The name of the default spool directory. If HAVE_TAYLOR_CONFIG is
set to 1, this may be overridden by the ``spool'' command in the
configuration file. */
+#ifndef SPOOLDIR
#define SPOOLDIR "/usr/spool/uucp"
/* #define SPOOLDIR "/var/spool/uucp" */
+#endif
/* The name of the default public directory. If HAVE_TAYLOR_CONFIG is
set to 1, this may be overridden by the ``pubdir'' command in the
configuration file. Also, a particular system may be given a
specific public directory by using the ``pubdir'' command in the
system file. */
+#ifndef PUBDIR
#define PUBDIR "/usr/spool/uucppublic"
/* #define PUBDIR "/var/spool/uucppublic" */
+#endif
/* The default command path. This is a space separated list of
directories. Remote command executions requested by uux are looked
@@ -589,7 +602,9 @@
command path may be overridden for a particular system. For most
systems, you should just make sure that the programs rmail and
rnews can be found using this path. */
+#ifndef CMDPATH
#define CMDPATH "/bin /usr/bin /usr/local/bin"
+#endif
/* The default amount of free space to require for systems that do not
specify an amount with the ``free-space'' command. This is only
@@ -644,23 +659,29 @@
/* The default log file when using HAVE_TAYLOR_LOGGING. When using
HAVE_TAYLOR_CONFIG, this may be overridden by the ``logfile''
command in the configuration file. */
+#ifndef LOGFILE
#define LOGFILE "/usr/spool/uucp/Log"
/* #define LOGFILE "/var/spool/uucp/Log" */
/* #define LOGFILE "/var/log/uucp/Log" */
+#endif
/* The default statistics file when using HAVE_TAYLOR_LOGGING. When
using HAVE_TAYLOR_CONFIG, this may be overridden by the
``statfile'' command in the configuration file. */
+#ifndef STATFILE
#define STATFILE "/usr/spool/uucp/Stats"
/* #define STATFILE "/var/spool/uucp/Stats" */
/* #define STATFILE "/var/log/uucp/Stats" */
+#endif
/* The default debugging file when using HAVE_TAYLOR_LOGGING. When
using HAVE_TAYLOR_CONFIG, this may be overridden by the
``debugfile'' command in the configuration file. */
+#ifndef DEBUGFILE
#define DEBUGFILE "/usr/spool/uucp/Debug"
/* #define DEBUGFILE "/var/spool/uucp/Debug" */
/* #define DEBUGFILE "/var/log/uucp/Debug" */
+#endif
#endif /* HAVE_TAYLOR_LOGGING */
@@ -669,17 +690,23 @@
/* The default log file when using HAVE_V2_LOGGING. When using
HAVE_TAYLOR_CONFIG, this may be overridden by the ``logfile''
command in the configuration file. */
+#ifndef LOGFILE
#define LOGFILE "/usr/spool/uucp/LOGFILE"
+#endif
/* The default statistics file when using HAVE_V2_LOGGING. When using
HAVE_TAYLOR_CONFIG, this may be overridden by the ``statfile''
command in the configuration file. */
+#ifndef STATFILE
#define STATFILE "/usr/spool/uucp/SYSLOG"
+#endif
/* The default debugging file when using HAVE_V2_LOGGING. When using
HAVE_TAYLOR_CONFIG, this may be overridden by the ``debugfile''
command in the configuration file. */
+#ifndef DEBUGFILE
#define DEBUGFILE "/usr/spool/uucp/DEBUG"
+#endif
#endif /* HAVE_V2_LOGGING */
@@ -692,16 +719,22 @@
be replaced by the system name (if there is no appropriate system,
"ANY" will be used). No other '%' character may appear in the
string. */
+#ifndef LOGFILE
#define LOGFILE "/usr/spool/uucp/.Log/%s/%s"
+#endif
/* The default statistics file when using HAVE_HDB_LOGGING. When using
HAVE_TAYLOR_CONFIG, this may be overridden by the ``statfile''
command in the configuration file. */
+#ifndef STATFILE
#define STATFILE "/usr/spool/uucp/.Admin/xferstats"
+#endif
/* The default debugging file when using HAVE_HDB_LOGGING. When using
HAVE_TAYLOR_CONFIG, this may be overridden by the ``debugfile''
command in the configuration file. */
+#ifndef DEBUGFILE
#define DEBUGFILE "/usr/spool/uucp/.Admin/audit.local"
+#endif
#endif /* HAVE_HDB_LOGGING */