update to 1.07
This commit is contained in:
parent
37cb16251e
commit
8fb19eef16
@ -1,36 +1,35 @@
|
||||
# $OpenBSD: Makefile,v 1.10 2003/05/12 18:02:45 sturm Exp $
|
||||
# $OpenBSD: Makefile,v 1.11 2003/12/14 01:39:18 naddy Exp $
|
||||
|
||||
COMMENT= "UUCP suite"
|
||||
|
||||
DISTNAME= uucp-1.06.2
|
||||
DISTNAME= uucp-1.07
|
||||
CATEGORIES= net mail
|
||||
MASTER_SITES= ${MASTER_SITE_GNU:=uucp/}
|
||||
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
WRKDIST= ${WRKDIR}/uucp-1.06.1
|
||||
MASTER_SITES= ${MASTER_SITE_GNU:=uucp/}
|
||||
|
||||
CONFIGURE_STYLE= gnu dest old
|
||||
CONFIGURE_STYLE=gnu
|
||||
CONFIGURE_ARGS= --sbindir=${PREFIX}/libexec/uucp \
|
||||
--with-newconfigdir=${SYSCONFDIR}/uucp \
|
||||
--with-oldconfigdir=${SYSCONFDIR}/uucp
|
||||
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
|
||||
|
||||
MAKE_FLAGS+= sbindir='$$(PREFIX)/libexec/uucp' \
|
||||
newconfigdir=${SYSCONFDIR}/uucp \
|
||||
oldconfigdir=${SYSCONFDIR}/uucp \
|
||||
MAKEINFO='makeinfo --no-split'
|
||||
post-extract:
|
||||
@rm ${WRKSRC}/uucp.info*
|
||||
|
||||
NO_REGRESS= Yes
|
||||
|
||||
FAKE_FLAGS= DESTDIR=${WRKINST} $(MAKE_FLAGS)
|
||||
FAKE_TARGET= install install-info
|
||||
SAMPLES= call config dial dialcode passwd port sys1 sys2
|
||||
|
||||
post-install:
|
||||
@perl -pi -e "s,%%SYSCONFDIR%%,${SYSCONFDIR}," \
|
||||
${PREFIX}/man/man1/uu{cp,stat,x}.1 \
|
||||
${PREFIX}/man/man8/uu{cico,xqt}.8
|
||||
@mv ${PREFIX}/libexec/uucp/uusched ${PREFIX}/bin
|
||||
@chown ${BINOWN}:${BINGRP} ${PREFIX}/bin/cu
|
||||
@chmod ${BINMODE} ${PREFIX}/bin/cu
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/uucp
|
||||
.for file in ${SAMPLES}
|
||||
${INSTALL_DATA} ${WRKSRC}/sample/${file} ${PREFIX}/share/examples/uucp
|
||||
.endfor
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (uucp-1.06.2.tar.gz) = 73af81dbd748292421a22141b25a5365
|
||||
RMD160 (uucp-1.06.2.tar.gz) = 30436ff77b488cccd7b16968ff4a367c64428d1f
|
||||
SHA1 (uucp-1.06.2.tar.gz) = 151be16280e2db54677460deaeb583d4b4c5556c
|
||||
MD5 (uucp-1.07.tar.gz) = 64c54d43787339a7cced48390eb3e1d0
|
||||
RMD160 (uucp-1.07.tar.gz) = e265ecd08245dd2510db20430a7a0e387ef4df51
|
||||
SHA1 (uucp-1.07.tar.gz) = e7c93c3aa6468f1b26dd4d9104dbbe8c2949e9ee
|
||||
|
18
net/uucp/patches/patch-configure
Normal file
18
net/uucp/patches/patch-configure
Normal file
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-configure,v 1.1 2003/12/14 01:39:18 naddy Exp $
|
||||
--- configure.orig 2003-11-11 18:15:02.000000000 +0100
|
||||
+++ configure 2003-11-11 20:24:38.000000000 +0100
|
||||
@@ -3939,12 +3939,14 @@ else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
+if test $ac_cv_func_ftime = yes; then
|
||||
if test $uucp_cv_sys_ftime_ok = yes || test $uucp_cv_sys_ftime_ok = runtime; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_FTIME 1
|
||||
EOF
|
||||
|
||||
fi
|
||||
+fi
|
||||
for ac_func in times
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-cu_1,v 1.2 2003/05/12 18:02:45 sturm Exp $
|
||||
--- cu.1.orig Sun Aug 20 15:29:24 1995
|
||||
+++ cu.1 Thu Jul 12 04:04:26 2001
|
||||
@@ -304,7 +304,7 @@ The file name may be changed at compilat
|
||||
approximation.
|
||||
|
||||
.br
|
||||
-/usr/lib/uucp/config - Configuration file.
|
||||
+%%SYSCONFDIR%%/uucp/config - Configuration file.
|
||||
.SH AUTHOR
|
||||
Ian Lance Taylor
|
||||
<ian@airs.com>
|
@ -1,9 +1,9 @@
|
||||
broken send file function fix, Frederick Bruckman, netbsd pr 6834
|
||||
|
||||
$OpenBSD: patch-cu_c,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
|
||||
--- cu.c.orig Sun Aug 20 15:29:25 1995
|
||||
+++ cu.c Thu Jul 12 02:01:04 2001
|
||||
@@ -2101,7 +2101,7 @@ fcusend_buf (qconn, zbufarg, cbufarg)
|
||||
$OpenBSD: patch-cu_c,v 1.2 2003/12/14 01:39:18 naddy Exp $
|
||||
--- cu.c.orig 2003-05-29 08:08:45.000000000 +0200
|
||||
+++ cu.c 2003-11-11 21:17:57.000000000 +0100
|
||||
@@ -2083,7 +2083,7 @@ fcusend_buf (qconn, zbufarg, cbufarg)
|
||||
of normal characters; when we send a newline we look for
|
||||
*zCuvar_echonl. */
|
||||
if ((fCuvar_echocheck && ! fCuvar_binary)
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-policy_h,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
|
||||
--- policy.h.orig Sun Aug 20 15:36:06 1995
|
||||
+++ policy.h Thu Jul 12 03:22:54 2001
|
||||
@@ -65,7 +65,7 @@
|
||||
$OpenBSD: patch-policy_h,v 1.2 2003/12/14 01:39:18 naddy Exp $
|
||||
--- policy.h.orig 2003-11-11 20:37:44.000000000 +0100
|
||||
+++ policy.h 2003-11-11 20:55:38.000000000 +0100
|
||||
@@ -64,7 +64,7 @@
|
||||
*/
|
||||
#define HAVE_BSD_TTY 0
|
||||
#define HAVE_SYSV_TERMIO 0
|
||||
@ -10,16 +10,7 @@ $OpenBSD: patch-policy_h,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
|
||||
|
||||
/* This code tries to guess which terminal driver to use if you did
|
||||
not make a choice above. It is in this file to make it easy to
|
||||
@@ -105,7 +105,7 @@
|
||||
set to 0 when it should be 1, file transfer will use more CPU time
|
||||
than necessary. If you are unsure, setting HAVE_UNBLOCKED_WRITES
|
||||
to 0 should always be safe. */
|
||||
-#define HAVE_UNBLOCKED_WRITES 0
|
||||
+#define HAVE_UNBLOCKED_WRITES 1
|
||||
|
||||
/* When the code does do a blocking write, it wants to write the
|
||||
largest amount of data which the kernel will accept as a single
|
||||
@@ -118,7 +118,7 @@
|
||||
@@ -117,7 +117,7 @@
|
||||
SINGLE_WRITE is too small, file transfer will use more CPU time
|
||||
than necessary. If you have no idea, 64 should work on most modern
|
||||
systems. */
|
||||
@ -28,7 +19,7 @@ $OpenBSD: patch-policy_h,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
|
||||
|
||||
/* Some tty drivers, such as those from SCO and AT&T's Unix PC, have a
|
||||
bug in the implementation of ioctl() that causes CLOCAL to be
|
||||
@@ -213,7 +213,7 @@
|
||||
@@ -212,7 +212,7 @@
|
||||
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. */
|
||||
@ -37,25 +28,26 @@ $OpenBSD: patch-policy_h,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
|
||||
|
||||
/* 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
|
||||
@@ -241,7 +241,7 @@
|
||||
@@ -240,8 +240,7 @@
|
||||
the sendmail choice below. Otherwise, select one of the other
|
||||
choices as appropriate. */
|
||||
#if 1
|
||||
-#define MAIL_PROGRAM "/usr/lib/sendmail -t"
|
||||
-/* #define MAIL_PROGRAM "/usr/sbin/sendmail -t" */
|
||||
+#define MAIL_PROGRAM "/usr/sbin/sendmail -t"
|
||||
#define MAIL_PROGRAM_TO_BODY 1
|
||||
#define MAIL_PROGRAM_SUBJECT_BODY 1
|
||||
#endif
|
||||
@@ -301,7 +301,7 @@
|
||||
@@ -301,7 +300,7 @@
|
||||
/* #define LOCKDIR "/etc/locks" */
|
||||
/* #define LOCKDIR "/usr/spool/locks" */
|
||||
/* #define LOCKDIR "/usr/spool/uucp/LCK" */
|
||||
-/* #define LOCKDIR "/var/spool/lock" */
|
||||
+#define LOCKDIR "/var/spool/lock"
|
||||
/* #define LOCKDIR "/var/lock" */
|
||||
|
||||
/* You must also specify the format of the lock files by setting
|
||||
exactly one of the following macros to 1. Check an existing lock
|
||||
@@ -465,8 +465,8 @@
|
||||
@@ -466,8 +465,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. */
|
||||
@ -66,7 +58,7 @@ $OpenBSD: patch-policy_h,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
|
||||
|
||||
/* Exactly one of the following macros must be set to 1. The exact
|
||||
format of the spool directories is explained in unix/spool.c.
|
||||
@@ -571,16 +571,14 @@
|
||||
@@ -572,16 +571,14 @@
|
||||
/* 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. */
|
||||
@ -85,12 +77,13 @@ $OpenBSD: patch-policy_h,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
|
||||
|
||||
/* The default command path. This is a space separated list of
|
||||
directories. Remote command executions requested by uux are looked
|
||||
@@ -643,20 +641,17 @@
|
||||
@@ -644,23 +641,17 @@
|
||||
/* 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. */
|
||||
-#define LOGFILE "/usr/spool/uucp/Log"
|
||||
-/* #define LOGFILE "/var/spool/uucp/Log" */
|
||||
-/* #define LOGFILE "/var/log/uucp/Log" */
|
||||
+#define LOGFILE "/var/spool/uucp/Log"
|
||||
|
||||
/* The default statistics file when using HAVE_TAYLOR_LOGGING. When
|
||||
@ -98,6 +91,7 @@ $OpenBSD: patch-policy_h,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
|
||||
``statfile'' command in the configuration file. */
|
||||
-#define STATFILE "/usr/spool/uucp/Stats"
|
||||
-/* #define STATFILE "/var/spool/uucp/Stats" */
|
||||
-/* #define STATFILE "/var/log/uucp/Stats" */
|
||||
+#define STATFILE "/var/spool/uucp/Stats"
|
||||
|
||||
/* The default debugging file when using HAVE_TAYLOR_LOGGING. When
|
||||
@ -105,11 +99,12 @@ $OpenBSD: patch-policy_h,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
|
||||
``debugfile'' command in the configuration file. */
|
||||
-#define DEBUGFILE "/usr/spool/uucp/Debug"
|
||||
-/* #define DEBUGFILE "/var/spool/uucp/Debug" */
|
||||
-/* #define DEBUGFILE "/var/log/uucp/Debug" */
|
||||
+#define DEBUGFILE "/var/spool/uucp/Debug"
|
||||
|
||||
#endif /* HAVE_TAYLOR_LOGGING */
|
||||
|
||||
@@ -665,17 +660,17 @@
|
||||
@@ -669,17 +660,17 @@
|
||||
/* 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. */
|
||||
@ -130,7 +125,7 @@ $OpenBSD: patch-policy_h,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
|
||||
|
||||
#endif /* HAVE_V2_LOGGING */
|
||||
|
||||
@@ -688,16 +683,16 @@
|
||||
@@ -692,16 +683,16 @@
|
||||
be replaced by the system name (if there is no appropriate system,
|
||||
"ANY" will be used). No other '%' character may appear in the
|
||||
string. */
|
||||
|
@ -1,10 +1,10 @@
|
||||
Deal with _POSIX_SAVED_IDS when relinquishing privileges
|
||||
use MAXHOSTNAMELEN
|
||||
|
||||
$OpenBSD: patch-unix_init_c,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
|
||||
--- unix/init.c.orig Sun Aug 20 15:30:24 1995
|
||||
+++ unix/init.c Thu Jul 12 21:56:10 2001
|
||||
@@ -210,7 +210,8 @@ usysdep_initialize (puuconf,iflags)
|
||||
$OpenBSD: patch-unix_init_c,v 1.2 2003/12/14 01:39:18 naddy Exp $
|
||||
--- unix/init.c.orig 2003-05-29 08:08:49.000000000 +0200
|
||||
+++ unix/init.c 2003-11-11 21:28:58.000000000 +0100
|
||||
@@ -209,7 +209,8 @@ usysdep_initialize (puuconf,iflags)
|
||||
if (iuuconf == UUCONF_NOT_FOUND)
|
||||
{
|
||||
#if HAVE_GETHOSTNAME
|
||||
@ -14,7 +14,7 @@ $OpenBSD: patch-unix_init_c,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
|
||||
|
||||
if (gethostname (ab, sizeof ab - 1) < 0)
|
||||
ulog (LOG_FATAL, "gethostname: %s", strerror (errno));
|
||||
@@ -272,8 +273,10 @@ usysdep_initialize (puuconf,iflags)
|
||||
@@ -271,8 +272,10 @@ usysdep_initialize (puuconf,iflags)
|
||||
&& geteuid () == 0)
|
||||
{
|
||||
q = getpwnam (OWNER);
|
||||
@ -26,9 +26,9 @@ $OpenBSD: patch-unix_init_c,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
|
||||
}
|
||||
|
||||
if ((iflags & INIT_GETCWD) != 0)
|
||||
@@ -371,8 +374,10 @@ usysdep_exit (fsuccess)
|
||||
@@ -370,8 +373,10 @@ usysdep_exit (fsuccess)
|
||||
boolean fsysdep_other_config (z)
|
||||
const char *z;
|
||||
const char *z ATTRIBUTE_UNUSED;
|
||||
{
|
||||
- (void) setuid (getuid ());
|
||||
+ (void) setegid (getgid ());
|
||||
|
@ -1,8 +1,8 @@
|
||||
handle "/*" path parsing correctly; netbsd pr#2970, darcey@druid.com
|
||||
|
||||
$OpenBSD: patch-unix_mkdirs_c,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
|
||||
--- unix/mkdirs.c.orig Sun Aug 20 15:30:30 1995
|
||||
+++ unix/mkdirs.c Thu Jul 12 21:56:10 2001
|
||||
$OpenBSD: patch-unix_mkdirs_c,v 1.2 2003/12/14 01:39:18 naddy Exp $
|
||||
--- unix/mkdirs.c.orig 2003-05-29 08:08:49.000000000 +0200
|
||||
+++ unix/mkdirs.c 2003-11-11 21:28:58.000000000 +0100
|
||||
@@ -28,11 +28,6 @@ fsysdep_make_dirs (zfile, fpublic)
|
||||
{
|
||||
if (*z == '/' && z != zcopy)
|
||||
@ -13,10 +13,10 @@ $OpenBSD: patch-unix_mkdirs_c,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
|
||||
- if (z[-1] == '/')
|
||||
- continue;
|
||||
*z = '\0';
|
||||
if (mkdir (zcopy, imode) != 0
|
||||
&& errno != EEXIST
|
||||
@@ -48,6 +43,11 @@ fsysdep_make_dirs (zfile, fpublic)
|
||||
return FALSE;
|
||||
if (mkdir (zcopy, imode) != 0)
|
||||
{
|
||||
@@ -53,6 +48,11 @@ fsysdep_make_dirs (zfile, fpublic)
|
||||
}
|
||||
}
|
||||
*z = '/';
|
||||
+ /* Some versions of uuto will send a double slash. Some
|
||||
|
@ -1,9 +1,9 @@
|
||||
Deal with _POSIX_SAVED_IDS when relinquishing privileges
|
||||
|
||||
$OpenBSD: patch-unix_spawn_c,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
|
||||
--- unix/spawn.c.orig Sun Aug 20 15:30:41 1995
|
||||
+++ unix/spawn.c Thu Jul 12 21:56:10 2001
|
||||
@@ -353,8 +353,10 @@ ixsspawn (pazargs, aidescs, fkeepuid, fk
|
||||
$OpenBSD: patch-unix_spawn_c,v 1.2 2003/12/14 01:39:18 naddy Exp $
|
||||
--- unix/spawn.c.orig 2003-05-29 08:08:49.000000000 +0200
|
||||
+++ unix/spawn.c 2003-11-11 21:28:58.000000000 +0100
|
||||
@@ -352,8 +352,10 @@ ixsspawn (pazargs, aidescs, fkeepuid, fk
|
||||
if (! fkeepuid)
|
||||
{
|
||||
/* Return to the uid of the invoking user. */
|
||||
|
@ -1,23 +1,23 @@
|
||||
64 bit clean; ross
|
||||
|
||||
$OpenBSD: patch-unix_tcp_c,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
|
||||
--- unix/tcp.c.orig Sun Aug 20 15:30:45 1995
|
||||
+++ unix/tcp.c Thu Jul 12 21:56:10 2001
|
||||
@@ -231,7 +231,7 @@ ftcp_open (qconn, ibaud, fwait)
|
||||
|
||||
$OpenBSD: patch-unix_tcp_c,v 1.2 2003/12/14 01:39:18 naddy Exp $
|
||||
--- unix/tcp.c.orig 2003-05-29 08:08:49.000000000 +0200
|
||||
+++ unix/tcp.c 2003-11-11 21:39:38.000000000 +0100
|
||||
@@ -395,7 +395,7 @@ ftcp_open (qconn, ibaud, fwait, fuser)
|
||||
while (! FGOT_SIGNAL ())
|
||||
{
|
||||
sockaddr_storage speer;
|
||||
- size_t clen;
|
||||
+ int clen;
|
||||
int onew;
|
||||
pid_t ipid;
|
||||
|
||||
@@ -370,7 +370,7 @@ ftcp_dial (qconn, puuconf, qsys, zphone,
|
||||
@@ -613,7 +613,7 @@ ftcp_dial (qconn, puuconf, qsys, zphone,
|
||||
|
||||
s.sin_family = AF_INET;
|
||||
s.sin_addr.s_addr = inet_addr ((char *) zhost);
|
||||
- if ((long) s.sin_addr.s_addr == (long) -1)
|
||||
+ if (s.sin_addr.s_addr == INADDR_NONE)
|
||||
{
|
||||
ulog (LOG_ERROR, "%s: unknown host name", zhost);
|
||||
return FALSE;
|
||||
sin.sin_family = AF_INET;
|
||||
sin.sin_addr.s_addr = inet_addr ((char *) zhost);
|
||||
- if ((long) sin.sin_addr.s_addr == (long) -1)
|
||||
+ if (sin.sin_addr.s_addr == INADDR_NONE)
|
||||
{
|
||||
ulog (LOG_ERROR, "%s: unknown host name", zhost);
|
||||
return FALSE;
|
||||
|
@ -1,41 +0,0 @@
|
||||
$OpenBSD: patch-uucico_8,v 1.2 2003/05/12 18:02:45 sturm Exp $
|
||||
--- uucico.8.orig Sun Aug 20 15:29:42 1995
|
||||
+++ uucico.8 Thu Jul 12 04:05:49 2001
|
||||
@@ -250,8 +250,8 @@ is equivalent to
|
||||
.B \-\-debug abnormal,chat.
|
||||
|
||||
The debugging output is sent to the debugging file, usually one of
|
||||
-/usr/spool/uucp/Debug, /usr/spool/uucp/DEBUG, or
|
||||
-/usr/spool/uucp/.Admin/audit.local.
|
||||
+/var/spool/uucp/Debug, /var/spool/uucp/DEBUG, or
|
||||
+/var/spool/uucp/.Admin/audit.local.
|
||||
.TP 5
|
||||
.B \-I file, \-\-config file
|
||||
Set configuration file to use. This option may not be available,
|
||||
@@ -269,20 +269,20 @@ The file names may be changed at compila
|
||||
configuration file, so these are only approximations.
|
||||
|
||||
.br
|
||||
-/usr/lib/uucp/config - Configuration file.
|
||||
+%%SYSCONFDIR%%/uucp/config - Configuration file.
|
||||
.br
|
||||
-/usr/lib/uucp/passwd - Default UUCP password file.
|
||||
+%%SYSCONFDIR%%/uucp/passwd - Default UUCP password file.
|
||||
.br
|
||||
-/usr/spool/uucp -
|
||||
+/var/spool/uucp -
|
||||
UUCP spool directory.
|
||||
.br
|
||||
-/usr/spool/uucp/Log -
|
||||
+/var/spool/uucp/Log -
|
||||
UUCP log file.
|
||||
.br
|
||||
-/usr/spool/uucppublic -
|
||||
+/var/spool/uucppublic -
|
||||
Default UUCP public directory.
|
||||
.br
|
||||
-/usr/spool/uucp/Debug -
|
||||
+/var/spool/uucp/Debug -
|
||||
Debugging file.
|
||||
.SH SEE ALSO
|
||||
kill(1), uucp(1), uux(1), uustat(1), uuxqt(8)
|
@ -1,9 +1,9 @@
|
||||
use %s with fprintf
|
||||
|
||||
$OpenBSD: patch-uuconv_c,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
|
||||
--- uuconv.c.orig Sun Aug 20 15:29:45 1995
|
||||
+++ uuconv.c Thu Jul 12 21:38:53 2001
|
||||
@@ -684,7 +684,7 @@ uvwrite_chat_script (e, pzarg)
|
||||
$OpenBSD: patch-uuconv_c,v 1.2 2003/12/14 01:39:18 naddy Exp $
|
||||
--- uuconv.c.orig 2003-05-29 08:08:47.000000000 +0200
|
||||
+++ uuconv.c 2003-11-11 21:17:58.000000000 +0100
|
||||
@@ -676,7 +676,7 @@ uvwrite_chat_script (e, pzarg)
|
||||
{
|
||||
if ((*pz)[0] != '-' && pz != pzarg)
|
||||
fprintf (e, " ");
|
||||
|
@ -1,23 +0,0 @@
|
||||
$OpenBSD: patch-uucp_1,v 1.2 2003/05/12 18:02:45 sturm Exp $
|
||||
--- uucp.1.orig Sun Aug 20 15:29:46 1995
|
||||
+++ uucp.1 Thu Jul 12 04:07:23 2001
|
||||
@@ -181,15 +181,15 @@ The file names may be changed at compila
|
||||
configuration file, so these are only approximations.
|
||||
|
||||
.br
|
||||
-/usr/lib/uucp/config - Configuration file.
|
||||
+%%SYSCONFDIR%%/uucp/config - Configuration file.
|
||||
.br
|
||||
-/usr/spool/uucp -
|
||||
+/var/spool/uucp -
|
||||
UUCP spool directory.
|
||||
.br
|
||||
-/usr/spool/uucp/Log -
|
||||
+/var/spool/uucp/Log -
|
||||
UUCP log file.
|
||||
.br
|
||||
-/usr/spool/uucppublic -
|
||||
+/var/spool/uucppublic -
|
||||
Default UUCP public directory.
|
||||
.SH SEE ALSO
|
||||
mail(1), uux(1), uustat(1), uucico(8)
|
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-uustat_1,v 1.2 2003/05/12 18:02:45 sturm Exp $
|
||||
--- uustat.1.orig Sun Aug 20 15:29:55 1995
|
||||
+++ uustat.1 Thu Jul 12 04:08:06 2001
|
||||
@@ -540,9 +540,9 @@ The file names may be changed at compila
|
||||
configuration file, so these are only approximations.
|
||||
|
||||
.br
|
||||
-/usr/lib/uucp/config - Configuration file.
|
||||
+%%SYSCONFDIR%%/uucp/config - Configuration file.
|
||||
.br
|
||||
-/usr/spool/uucp -
|
||||
+/var/spool/uucp -
|
||||
UUCP spool directory.
|
||||
.SH SEE ALSO
|
||||
ps(1), rmail(1), uucp(1), uux(1), uucico(8), uuxqt(8)
|
@ -1,32 +0,0 @@
|
||||
$OpenBSD: patch-uux_1,v 1.2 2003/05/12 18:02:45 sturm Exp $
|
||||
--- uux.1.orig Sun Aug 20 15:29:57 1995
|
||||
+++ uux.1 Thu Jul 12 04:08:36 2001
|
||||
@@ -40,7 +40,7 @@ file to a command being executed on a re
|
||||
not absolute, it will be appended to the current working directory on
|
||||
the local system; the result may not be meaningful on the remote
|
||||
system. A pathname may begin with ~/, in which case it is relative to
|
||||
-the UUCP public directory (usually /usr/spool/uucppublic) on the
|
||||
+the UUCP public directory (usually /var/spool/uucppublic) on the
|
||||
appropriate system. A pathname may begin with ~name/, in which case
|
||||
it is relative to the home directory of the named user on the
|
||||
appropriate system.
|
||||
@@ -231,15 +231,15 @@ The file names may be changed at compila
|
||||
configuration file, so these are only approximations.
|
||||
|
||||
.br
|
||||
-/usr/lib/uucp/config - Configuration file.
|
||||
+%%SYSCONFDIR%%/uucp/config - Configuration file.
|
||||
.br
|
||||
-/usr/spool/uucp -
|
||||
+/var/spool/uucp -
|
||||
UUCP spool directory.
|
||||
.br
|
||||
-/usr/spool/uucp/Log -
|
||||
+/var/spool/uucp/Log -
|
||||
UUCP log file.
|
||||
.br
|
||||
-/usr/spool/uucppublic -
|
||||
+/var/spool/uucppublic -
|
||||
Default UUCP public directory.
|
||||
.SH SEE ALSO
|
||||
mail(1), uustat(1), uucp(1), uucico(8), uuxqt(8)
|
@ -1,14 +0,0 @@
|
||||
tromping one byte too far; tron@lyssa.owl.de
|
||||
|
||||
$OpenBSD: patch-uux_c,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
|
||||
--- uux.c.orig Sun Aug 20 15:29:57 1995
|
||||
+++ uux.c Thu Jul 12 21:35:20 2001
|
||||
@@ -532,7 +532,7 @@ main (argc, argv)
|
||||
else
|
||||
{
|
||||
clen = zexclam - zcmd;
|
||||
- zforward = zbufalc (clen);
|
||||
+ zforward = zbufalc (clen + 1);
|
||||
memcpy (zforward, zcmd, clen);
|
||||
zforward[clen] = '\0';
|
||||
zcmd = zexclam + 1;
|
@ -1,38 +0,0 @@
|
||||
$OpenBSD: patch-uuxqt_8,v 1.2 2003/05/12 18:02:45 sturm Exp $
|
||||
--- uuxqt.8.orig Sun Aug 20 15:29:58 1995
|
||||
+++ uuxqt.8 Thu Jul 12 04:09:00 2001
|
||||
@@ -64,8 +64,8 @@ is equivalent to
|
||||
.B \-\-debug abnormal,chat.
|
||||
|
||||
The debugging output is sent to the debugging file, usually one of
|
||||
-/usr/spool/uucp/Debug, /usr/spool/uucp/DEBUG, or
|
||||
-/usr/spool/uucp/.Admin/audit.local.
|
||||
+/var/spool/uucp/Debug, /var/spool/uucp/DEBUG, or
|
||||
+/var/spool/uucp/.Admin/audit.local.
|
||||
.TP 5
|
||||
.B \-I file, \-\-config
|
||||
Set configuration file to use. This option may not be available,
|
||||
@@ -83,18 +83,18 @@ The file names may be changed at compila
|
||||
configuration file, so these are only approximations.
|
||||
|
||||
.br
|
||||
-/usr/lib/uucp/config - Configuration file.
|
||||
+%%SYSCONFDIR%%/uucp/config - Configuration file.
|
||||
.br
|
||||
-/usr/spool/uucp -
|
||||
+/var/spool/uucp -
|
||||
UUCP spool directory.
|
||||
.br
|
||||
-/usr/spool/uucp/Log -
|
||||
+/var/spool/uucp/Log -
|
||||
UUCP log file.
|
||||
.br
|
||||
-/usr/spool/uucppublic -
|
||||
+/var/spool/uucppublic -
|
||||
Default UUCP public directory.
|
||||
.br
|
||||
-/usr/spool/uucp/Debug -
|
||||
+/var/spool/uucp/Debug -
|
||||
Debugging file.
|
||||
.SH SEE ALSO
|
||||
uucp(1), uux(1), uucico(8)
|
@ -1,48 +0,0 @@
|
||||
$OpenBSD: patch-uuxqt_c,v 1.1 2001/09/12 12:22:47 fgsch Exp $
|
||||
--- uuxqt.c.orig Sun Aug 20 16:29:59 1995
|
||||
+++ uuxqt.c Wed Sep 12 09:07:17 2001
|
||||
@@ -928,6 +928,44 @@ uqdo_xqt_file (puuconf, zfile, zbase, qs
|
||||
don't permit multiple arguments. */
|
||||
for (i = 1; azQargs[i] != NULL; i++)
|
||||
{
|
||||
+ if (azQargs[i][0] == '-' && azQargs[i][1] == '-')
|
||||
+ {
|
||||
+ char *zopts = azQargs[i] + 2;
|
||||
+
|
||||
+ /* The -g, -n, and -s options take an argument. */
|
||||
+ if (!strncmp(zopts, "grade", 5) && zopts[5] != '=')
|
||||
+ {
|
||||
+ if (azQargs[i+1] != NULL)
|
||||
+ ++i;
|
||||
+ }
|
||||
+ if (!(strncmp(zopts, "notify", 6)
|
||||
+ && strncmp(zopts, "status", 6)) && zopts[6] != '=')
|
||||
+ {
|
||||
+ if (azQargs[i+1] != NULL)
|
||||
+ ++i;
|
||||
+ }
|
||||
+
|
||||
+ /* The -I, -u and -x options are not permitted. */
|
||||
+ if (!strncmp(zopts, "config", 6))
|
||||
+ {
|
||||
+ if (zopts[6] != '=' && azQargs[i+1] != NULL)
|
||||
+ ++i;
|
||||
+ azQargs[i] = zbufcpy ("--nouucico");
|
||||
+ }
|
||||
+ if (!strncmp(zopts, "user", 4))
|
||||
+ {
|
||||
+ if (zopts[4] != '=' && azQargs[i+1] != NULL)
|
||||
+ ++i;
|
||||
+ azQargs[i] = zbufcpy ("--nouucico");
|
||||
+ }
|
||||
+ if (!strncmp(zopts, "debug", 5))
|
||||
+ {
|
||||
+ if (zopts[5] != '=' && azQargs[i+1] != NULL)
|
||||
+ ++i;
|
||||
+ azQargs[i] = zbufcpy ("--nouucico");
|
||||
+ }
|
||||
+ }
|
||||
+ else
|
||||
if (azQargs[i][0] == '-')
|
||||
{
|
||||
char *zopts;
|
@ -2,7 +2,5 @@ This is the standard UUCP package of the Free Software Foundation.
|
||||
|
||||
The package currently supports the 'f', 'g' (in all window and packet
|
||||
sizes), 'G', 't' and 'e' protocols, as well a Zmodem protocol, the FX
|
||||
UUCICO 'y' protocol, and two new bidirectional protocols. If you have
|
||||
a Berkeley sockets library, it can make TCP connections. If you have
|
||||
TLI libraries, it can make TLI connections. It supports a new
|
||||
configuration file mechanism which I like (but other people dislike).
|
||||
UUCICO 'y' protocol, and two new bidirectional protocols. It can make
|
||||
TCP connections.
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.2 2001/09/10 19:04:11 espie Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.3 2003/12/14 01:39:18 naddy Exp $
|
||||
@unexec install-info --delete --info-dir=%D/info %D/info/uucp.info
|
||||
bin/cu
|
||||
bin/uucp
|
||||
@ -20,5 +20,14 @@ man/man1/uustat.1
|
||||
man/man1/uux.1
|
||||
man/man8/uucico.8
|
||||
man/man8/uuxqt.8
|
||||
share/examples/uucp/call
|
||||
share/examples/uucp/config
|
||||
share/examples/uucp/dial
|
||||
share/examples/uucp/dialcode
|
||||
share/examples/uucp/passwd
|
||||
share/examples/uucp/port
|
||||
share/examples/uucp/sys1
|
||||
share/examples/uucp/sys2
|
||||
@dirrm share/examples/uucp
|
||||
@dirrm libexec/uucp
|
||||
@exec install-info --info-dir=%D/info %D/info/uucp.info
|
||||
|
Loading…
Reference in New Issue
Block a user