File uucp-1.07-contrib.dif of Package sendmail

--- contrib/Makefile.uurt
+++ contrib/Makefile.uurt	Thu Jun 26 16:47:59 2003
@@ -3,7 +3,7 @@
 #
 
 # Prefix directory for installation directories.
-prefix = /usr/local
+prefix = /usr
 
 # Directory where the needed .h files are installed (uucp.h ...).
 uucpsrcs = ../
--- contrib/Makefile.xchat
+++ contrib/Makefile.xchat	Thu Jun 26 16:47:59 2003
@@ -5,7 +5,7 @@
 #
 CC=cc
 SHELL=/bin/sh
-BIN=/usr/local/lib/uucp
+BIN=/usr/lib/uucp
 PROGS=xchat
 
 #-----------
--- contrib/amiga.c
+++ contrib/amiga.c	Thu Jun 26 16:51:06 2003
@@ -30,7 +30,7 @@
 int main(int argc,char *argv[],char *envp)
 {
   struct passwd *pw;
-  char   *name = {"/usr/lib/uucp/uucico.real"};
+  char   *name = {"/usr/lib/uucp/uucico"};
 
   if (sysm68k(_m68k_LIMUSER,EUA_GET_LIC) == 0 ) { /* are we unlicensed? */
     if (sysm68k(_m68k_LIMUSER,EUA_UUCP) == -1) { /* yes, get a "uucp"
--- contrib/stats.sh
+++ contrib/stats.sh	Thu Jun 26 16:47:59 2003
@@ -8,7 +8,7 @@
 # (since baud is not really the correct name for it and bits/s actually
 # depends on the number of start and stop bits etc)
 
-grep bytes /usr/spool/uucp/Stats | grep -v 'bytes 0.00 secs' | grep -v 'failed after' | tail -80 | \
+grep bytes /var/log/uucp/Stats | grep -v 'bytes 0.00 secs' | grep -v 'failed after' | tail -80 | \
 gawk '
   BEGIN {
     printf("          UUCP transmission history:\n");
--- contrib/uuclean
+++ contrib/uuclean	Thu Jun 26 16:47:59 2003
@@ -3,8 +3,8 @@
 # Do whatever you like with this script.
 #
 # Set some variables
-bindir=/usr/local/bin
-spooldir=/usr/spool/uucp
+bindir=/usr/bin
+spooldir=/var/spool/uucp
 #
 # Warn about all mail over two days old
 $(bindir)/uustat -c rmail -o 48 -N -Q -W"Unable to deliver; will try up to one week"
--- contrib/uudemon.shar
+++ contrib/uudemon.shar	Thu Jun 26 16:47:59 2003
@@ -43,7 +43,7 @@
 X# change LIBDIR to where UUCP library/conf. files are
 X# change SPOOLDIR to the UUCP spool directory.  It must be HDB-ish.
 XLIBDIR=/usr/lib/uucp; export LIBDIR
-XSPOOLDIR=/usr/spool/uucp; export SPOOLDIR
+XSPOOLDIR=/var/spool/uucp; export SPOOLDIR
 X
 X###  no changes needed past here  ###
 X
--- contrib/uupoll.shar
+++ contrib/uupoll.shar	Thu Jun 26 16:47:59 2003
@@ -33,7 +33,7 @@
 # borrowed and hacked from Taylor UUCP 1.04
 X
 # Prefix directory for installation directories.
-prefix = /usr/local
+prefix = /usr
 X
 # The user name/group that should own the resulting executables.
 # Both should run suid.
@@ -174,7 +174,7 @@
 started by an entry in the crontab tables in just the same way uucico is
 started (it will start uucico):
 X
-05 5 * * *       uucp  /usr/local/lib/uucp/autopoll -r1 >>/tmp/poll.log 2>&1
+05 5 * * *       uucp  /usr/lib/uucp/autopoll -r1 >>/tmp/poll.log 2>&1
 X
 Any messages go to stderr or a file (if compiled with that option); in case
 the file could not be opened it will use stdout to tell you just that and quit.
@@ -384,12 +384,10 @@
 a failing call. 
 .SH FILES
 .nf
-/usr/local/lib/uucp	UUCP internal utilities
-/usr/lib/uucp
-/usr/local/bin		UUCP internal utilities
-/usr/bin
-/usr/spool/uucp/.Status/	Status files for each site
-/usr/spool/uucp/	UUCP spool area. one of its sub-
+/usr/lib/uucp	UUCP internal utilities
+/usr/bin		UUCP internal utilities
+/var/log/uucp/Stats	Status file for each site
+/var/spool/uucp/	UUCP spool area. one of its sub-
 X				directories will hold the null jobs.
 /tmp/poll.log		This file is present only if autopoll
 X				has been compiled to place the messages
@@ -1672,15 +1670,15 @@
 /*    Define the complete path to the uuname program.
 X *    If undefined we'll use just the name 'uuname' to call it
 X * */
-#define UNAME_DIR "/usr/local/bin/uuname"
+#define UNAME_DIR "/usr/bin/uuname"
 X
 /*    define the path to the directory which does contain uucico */
-#define CICO_DIR "/usr/local/lib/uucp/uucico"
+#define CICO_DIR "/usr/lib/uucp/uucico"
 X
 /*    define the path to the directory which holds all the uucp files.
 X *    We'll place the poll file in one of it's subdirectories
 X * */
-#define SPOOL_DIR "/usr/spool/uucp"
+#define SPOOL_DIR "/var/spool/uucp"
 X
 /*    at least one of the follwing must be defined To use the second or  
 X *    third set of definitions, change the  ``#if 1'' to ``#if 0'' 
@@ -1724,7 +1722,7 @@
 X *    This will assure that we get the one we want
 X *    The path must be the same as given in Makefile (lbindir) 
 X * */
-#define AUTO_DIR "/usr/local/lib/uucp/autopoll"
+#define AUTO_DIR "/usr/lib/uucp/autopoll"
 X
 /*    define the path to the directory which is to contain the
 X *    message log created by autopoll and the file name itself.
@@ -1737,11 +1735,11 @@
 /*    define the full path to the directory which holds the status files
 X *    The name should be given *except* the sitename. A trailing `/' if any
 X *    must be given.
-X *    Example: /usr/spool/uucp/.Status/sys.sitename
+X *    Example: /var/spool/uucp/.Status/sys.sitename
 X *             then specify STATUS_DIR as
-X *             "/usr/spool/uucp/.Status/sys."
+X *             "/var/spool/uucp/.Status/sys."
 X * */
-#define STATUS_DIR "/usr/spool/uucp/.Status/" 
+#define STATUS_DIR "/var/spool/uucp/.Status/" 
 #endif
 SHAR_EOF
 chmod 0444 uupoll/conf.h ||
@@ -1906,10 +1904,10 @@
 .IR all
 sites given. That may lead to a `No port available' condition.
 .SH FILES
-.ta \w'/usr/spool/uucp/   'u
+.ta \w'/var/spool/uucp/   'u
 .nf
 /etc/uucp/	UUCP internal files/utilities
-/usr/spool/uucp/	Spool directory
+/var/spool/uucp/	Spool directory
 /tmp/poll.log		This file is present only if uupoll has been
 X			compiled to place the messages into a file.
 X			Otherwise all messages will go to stderr.
--- contrib/uuq.sh
+++ contrib/uuq.sh	Thu Jun 26 16:47:59 2003
@@ -4,7 +4,7 @@
 #       note - uses the uuname script or similar functionality.
 # Zacharias Beckman
 
-SPOOLDIR="/usr/spool/uucp"
+SPOOLDIR="/var/spool/uucp"
 SYSTEMS=`uuname`
 TMPFILE="/tmp/uuq.tmp"
 FORSYSTEM=""
--- contrib/uurate.c
+++ contrib/uurate.c	Thu Jun 26 16:47:59 2003
@@ -307,6 +307,7 @@
   int sent, called = IN;
   int report = 0;            /* if <= 0 give msg that no report was avail. */
   int junk;
+  extern int getopt();
 
   /* --------------------------------------------------------------------
    *           P r o l o g
--- contrib/uurate.man
+++ contrib/uurate.man	Thu Jun 26 16:47:59 2003
@@ -1,4 +1,4 @@
-''' $Id: uurate.man,v 1.4 1993/09/28 17:38:31 kdburg Rel $
+'\" $Id: uurate.man,v 1.4 1993/09/28 17:38:31 kdburg Rel $
 .TH uurate 1
 .SH NAME
 uurate \- Report Taylor UUCP statistics
@@ -252,8 +252,8 @@
 .nf
 .in +.3in
 .ta 2.2i
-.IR "/usr/spool/uucp/Log	" "V2/Taylor format call/execution log,"
-.IR "/usr/spool/uucp/Stats	" "V2/Taylor format file transfer log."
+.IR "/var/log/uucp/Log		" "V2/Taylor format call/execution log,"
+.IR "/var/log/uucp/Stats	" "V2/Taylor format file transfer log."
 .SS "SEE ALSO"
 .IR uucico "(8)"
 .SS BUGS
--- contrib/uureroute.perl
+++ contrib/uureroute.perl	Thu Jun 26 16:54:33 2003
@@ -34,7 +34,7 @@
 #
 ";
 
-$UUSTAT = "uustat";
+$UUSTAT = "/usr/bin/uustat";
 $SHELL = "/bin/sh";
 $SMAIL = "/bin/smail";
 
@@ -61,7 +61,7 @@
 while ($system = shift)
 {
     $sysprefix = substr ($system, 0, 7);
-    $directory = "/usr/spool/uucp/$sysprefix";
+    $directory = "/var/spool/uucp/$sysprefix";
     open (UUSTAT, "$UUSTAT -s $system -c rmail |");
     print "set -ex\n";
     while (<UUSTAT>)
--- contrib/uusnap.c
+++ contrib/uusnap.c	Thu Jun 26 16:48:01 2003
@@ -11,7 +11,7 @@
    At the moment it only works with taylor config and taylor dirs
 
    compile it form the Makefile or:
-   cc -c -g -pipe -O  -I. -I. -DNEWCONFIGLIB=\"/usr/local/lib/uucp\" uusnap.c
+   cc -c -g -pipe -O  -I. -I. -DNEWCONFIGLIB=\"/usr/lib/uucp\" uusnap.c
    cc  -o uusnap uusnap.o 
    For this, uusnap.[ch] must be in the same directory as uucp.h and so.
 
--- contrib/uutraf
+++ contrib/uutraf	Thu Jun 26 16:48:01 2003
@@ -52,21 +52,21 @@
 }
 
 if ( $uucp_type eq "taylor" || $uucp_type eq "gnu" ) {
-    @ARGV = ("/usr/local/spool/uucp/Stats") unless $#ARGV >= 0;
+    @ARGV = ("/var/log/uucp/Stats") unless $#ARGV >= 0;
     $pat = "^[^ ]+ ([^ ]+) \\(([-0-9:\\/ .]+)\\) " .
 	"(sent|received) (\\d+) bytes in (\\d+)\\.(\\d+) seconds";
     $uucp_type = 0;
     $recv = "received";
 }
 elsif ( $uucp_type eq "hdb" || $uucp_type eq "bnu" ) {
-    @ARGV = ("/usr/spool/uucp/.Admin/xferstats") unless $#ARGV >= 0;
+    @ARGV = ("/var/spool/uucp/.Admin/xferstats") unless $#ARGV >= 0;
     $pat = "^([^!]+)![^(]+\\(([-0-9:\\/]+)\\).+([<>])-? " .
 	"(\\d+) \\/ (\\d+)\\.(\\d+) secs";
     $uucp_type = 1;
     $recv = "<";
 }
 elsif ( $uucp_type eq "bsd" || $uucp_type eq "v7" ) {
-    @ARGV = ("/usr/spool/uucp/SYSLOG") unless $#ARGV >= 0;
+    @ARGV = ("/var/spool/uucp/SYSLOG") unless $#ARGV >= 0;
     $pat = "^[^ ]+ ([^ ]+) \\(([-0-9:\\/]+)\\) \\([^)]+\\) " .
 	"(sent|received) (\\d+) b (\\d+) secs";
     $uucp_type = 2;
--- contrib/uutry
+++ contrib/uutry	Thu Jun 26 16:48:01 2003
@@ -14,10 +14,11 @@
 # The following variables should be gropped from the configuration
 # files rather then being hard coded here.
 #
-Spool=/usr/spool/uucp
-Lib=/usr/local/lib/uucp
-Status=$Spool/.Status
-Debug=$Spool/Debug
+Spool=/var/spool/uucp
+Lib=/usr/lib/uucp
+Log=/var/log
+Status=$Log/Stats
+Debug=$Log/Debug
 Uucico=$Lib/uucico
 #
 # Default option values
--- contrib/xc-conf.h-dist
+++ contrib/xc-conf.h-dist	Thu Jun 26 16:48:01 2003
@@ -26,7 +26,7 @@
  * executed. Normally, this is the same place you put your config
  * and system files for UUCP.
  */
-#define SCRIPT_DIR "/usr/local/conf/uucp/" /* MUST HAVE TRAILING "/" */
+#define SCRIPT_DIR "/etc/uucp/" /* MUST HAVE TRAILING "/" */
 
 /*
  * The following definition establishes the default path to the
@@ -34,5 +34,5 @@
  * this is the same location you configured Taylor UUCP to put its
  * log files.
  */
-#define LOG_DIR "/usr/spool/uucp/" 	   /* MUST HAVE TRAILING "/" */
+#define LOG_DIR "/var/log/uucp/" 	   /* MUST HAVE TRAILING "/" */
 
--- contrib/xchat.man
+++ contrib/xchat.man	Thu Jun 26 16:48:01 2003
@@ -14,7 +14,7 @@
 begins with ``/'', then it is assumed to be a full path name for the
 script file. If not, a configuration-dependent default directory path
 (usually
-.B "/usr/local/conf/uucp/"
+.B "/etc/uucp/"
 ) is prepended to the script file name. Normally, the default path
 is the same as that for the Taylor UUCP configuration files.
 .SH DESCRIPTION
@@ -163,7 +163,7 @@
 begins with ``/'', it is assumed to be an absolute path name for the
 debugging file. If not, then a configuration-dependent default directory 
 path (usually
-.B "/usr/spool/uucp"
+.B "/var/spool/uucp"
 ) is prepended to
 .I xstr.
 Normally the default path is that of the directory where Taylor UUCP
openSUSE Build Service is sponsored by