head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.160
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.158
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.156
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.154
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.152
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.150
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.148
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.146
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.144
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.142
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.140
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.138
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.136
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.134
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.132
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.130
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.128
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.126
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.124
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.122
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.120
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.118
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.116
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.112
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.92
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.114
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.110
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.108
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.106
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.104
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.102
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.100
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.98
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.96
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.94
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.90
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.88
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.86
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.84
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.82
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.80
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.78
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.76
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.74
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.72
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.70
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.68
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.66
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.64
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.62
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.60
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.58
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.56
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.54
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.52
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.50
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.48
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.46
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.44
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.42
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.40
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.38
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.36
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.34
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.32
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.30
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.28
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.26
	pkgsrc-2009Q2-base:1.1
	pkgsrc-2009Q1:1.1.0.24
	pkgsrc-2009Q1-base:1.1
	pkgsrc-2008Q4:1.1.0.22
	pkgsrc-2008Q4-base:1.1
	pkgsrc-2008Q3:1.1.0.20
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.18
	cube-native-xorg-base:1.1
	pkgsrc-2008Q2:1.1.0.16
	pkgsrc-2008Q2-base:1.1
	cwrapper:1.1.0.14
	pkgsrc-2008Q1:1.1.0.12
	pkgsrc-2008Q1-base:1.1
	pkgsrc-2007Q4:1.1.0.10
	pkgsrc-2007Q4-base:1.1
	pkgsrc-2007Q3:1.1.0.8
	pkgsrc-2007Q3-base:1.1
	pkgsrc-2007Q2:1.1.0.6
	pkgsrc-2007Q2-base:1.1
	pkgsrc-2007Q1:1.1.0.4
	pkgsrc-2007Q1-base:1.1
	pkgsrc-2006Q4:1.1.0.2
	pkgsrc-2006Q4-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2006.10.30.03.33.59;	author jlam;	state Exp;
branches;
next	;


desc
@@


1.1
log
@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.
@
text
@$NetBSD$

--- 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 */
@