pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/uucp Merge improvements from the version of Taylor...
details: https://anonhg.NetBSD.org/pkgsrc/rev/6a4c44f16bb0
branches: trunk
changeset: 520802:6a4c44f16bb0
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon Oct 30 03:33:59 2006 +0000
description:
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.
diffstat:
net/uucp/DESCR | 15 +--
net/uucp/Makefile | 43 +++++++++--
net/uucp/distinfo | 18 ++++-
net/uucp/patches/patch-aa | 2 +-
net/uucp/patches/patch-ab | 12 +++
net/uucp/patches/patch-ac | 28 +++++++
net/uucp/patches/patch-ad | 150 ++++++++++++++++++++++++++++++++++++++++++
net/uucp/patches/patch-ae | 15 ++++
net/uucp/patches/patch-af | 164 ++++++++++++++++++++++++++++++++++++++++++++++
net/uucp/patches/patch-ag | 30 ++++++++
net/uucp/patches/patch-ah | 15 ++++
net/uucp/patches/patch-ai | 24 ++++++
net/uucp/patches/patch-aj | 13 +++
net/uucp/patches/patch-ak | 16 ++++
net/uucp/patches/patch-al | 26 +++++++
net/uucp/patches/patch-am | 13 +++
net/uucp/patches/patch-an | 44 ++++++++++++
net/uucp/patches/patch-ao | 22 ++++++
net/uucp/patches/patch-ap | 22 ++++++
net/uucp/patches/patch-aq | 13 +++
20 files changed, 665 insertions(+), 20 deletions(-)
diffs (truncated from 796 to 300 lines):
diff -r 77c60b4dd1ab -r 6a4c44f16bb0 net/uucp/DESCR
--- a/net/uucp/DESCR Sun Oct 29 23:57:48 2006 +0000
+++ b/net/uucp/DESCR Mon Oct 30 03:33:59 2006 +0000
@@ -1,8 +1,7 @@
-This package provides everything you need to make a UUCP connection.
-It 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.
-
+The Taylor UUCP package provides everything you need to make a UUCP
+connection. It 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.
diff -r 77c60b4dd1ab -r 6a4c44f16bb0 net/uucp/Makefile
--- a/net/uucp/Makefile Sun Oct 29 23:57:48 2006 +0000
+++ b/net/uucp/Makefile Mon Oct 30 03:33:59 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/04/24 23:21:46 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2006/10/30 03:33:59 jlam Exp $
DISTNAME= uucp-1.07
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GNU:=uucp/}
@@ -12,7 +13,7 @@
PKG_SYSCONFSUBDIR= uucp
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-user=uucp
+CONFIGURE_ARGS+= --with-user=${UUCP_USER}
CONFIGURE_ARGS+= --with-newconfigdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+= --with-oldconfigdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ENV+= MKDIR_PROGRAM=${TOOLS_MKDIR:Q}
@@ -20,18 +21,40 @@
CONFIGURE_ENV+= RMDIR_PROGRAM=${TOOLS_RMDIR:Q}
UUCP_GROUP?= daemon
+UUCP_USER?= uucp
PKG_GROUPS= ${UUCP_GROUP}
-PKG_USERS= uucp:${UUCP_GROUP}
+PKG_USERS= ${UUCP_USER}:${UUCP_GROUP}
INFO_FILES= # PLIST
# UUCP installs many set-uid "uucp" binaries.
-SPECIAL_PERMS+= bin/cu uucp ${ROOT_GROUP} 4555
-SPECIAL_PERMS+= bin/uucp uucp ${ROOT_GROUP} 4555
-SPECIAL_PERMS+= bin/uuname uucp ${ROOT_GROUP} 4555
-SPECIAL_PERMS+= bin/uustat uucp ${ROOT_GROUP} 4555
-SPECIAL_PERMS+= bin/uux uucp ${ROOT_GROUP} 4555
-SPECIAL_PERMS+= sbin/uucico uucp ${ROOT_GROUP} 4555
-SPECIAL_PERMS+= sbin/uuxqt uucp ${ROOT_GROUP} 4555
+SPECIAL_PERMS+= bin/cu ${UUCP_USER} ${ROOT_GROUP} 4555
+SPECIAL_PERMS+= bin/uucp ${UUCP_USER} ${ROOT_GROUP} 4555
+SPECIAL_PERMS+= bin/uuname ${UUCP_USER} ${ROOT_GROUP} 4555
+SPECIAL_PERMS+= bin/uustat ${UUCP_USER} ${ROOT_GROUP} 4555
+SPECIAL_PERMS+= bin/uux ${UUCP_USER} ${ROOT_GROUP} 4555
+SPECIAL_PERMS+= sbin/uucico ${UUCP_USER} ${ROOT_GROUP} 4555
+SPECIAL_PERMS+= sbin/uuxqt ${UUCP_USER} ${ROOT_GROUP} 4555
+
+SENDMAIL?= /usr/sbin/sendmail
+
+UUCP_MAIL_PROGRAM?= ${SENDMAIL} -t
+UUCP_CMDPATH?= /bin /usr/bin ${PREFIX}/bin
+UUCP_LOCKDIR?= ${VARBASE}/spool/lock
+UUCP_SPOOLDIR?= ${VARBASE}/spool/uucp
+UUCP_PUBDIR?= ${UUCP_SPOOLDIR}public
+UUCP_LOGFILE?= ${UUCP_SPOOLDIR}/Log
+UUCP_STATFILE?= ${UUCP_SPOOLDIR}/Stats
+UUCP_DEBUGFILE?= ${UUCP_SPOOLDIR}/Debug
+
+# Generate a policy_local.h header file that holds the paths used by UUCP.
+post-configure:
+ @${RM} -f ${WRKSRC}/policy_local.h
+.for _var_ in MAIL_PROGRAM CMDPATH LOCKDIR \
+ SPOOLDIR PUBDIR LOGFILE \
+ STATFILE DEBUGFILE
+ @${ECHO} "#define ${_var_} \""${UUCP_${_var_}:Q}"\"" \
+ >> ${WRKSRC}/policy_local.h
+.endfor
.include "../../mk/bsd.pkg.mk"
diff -r 77c60b4dd1ab -r 6a4c44f16bb0 net/uucp/distinfo
--- a/net/uucp/distinfo Sun Oct 29 23:57:48 2006 +0000
+++ b/net/uucp/distinfo Mon Oct 30 03:33:59 2006 +0000
@@ -1,6 +1,22 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/04/24 23:21:46 jlam Exp $
+$NetBSD: distinfo,v 1.2 2006/10/30 03:33:59 jlam Exp $
SHA1 (uucp-1.07.tar.gz) = e7c93c3aa6468f1b26dd4d9104dbbe8c2949e9ee
RMD160 (uucp-1.07.tar.gz) = e265ecd08245dd2510db20430a7a0e387ef4df51
Size (uucp-1.07.tar.gz) = 1013234 bytes
SHA1 (patch-aa) = 4fc29d344083abc4ea57194c1f4f9cd77aa763eb
+SHA1 (patch-ab) = 28f7010cd2db58d0252602cf3aecef8dc56d1b01
+SHA1 (patch-ac) = 98cf1cfec963e165828b496b3d3bc4c06d883ef5
+SHA1 (patch-ad) = 8343bd4d774ff626df53b2c7b37ea102531941fa
+SHA1 (patch-ae) = ab53bb0e77bf7da984c04bdd6236b9c8794ed2b9
+SHA1 (patch-af) = aeeb31483f90c8879900e282b6f703291ba37c79
+SHA1 (patch-ag) = 5e8725073f4874555750911a8369fad318cd11ce
+SHA1 (patch-ah) = 68ffd0b3e338a3df98ff1a93ec37e3bfd898f6b9
+SHA1 (patch-ai) = 78a4bc213b5e689dbcd2347226355edc57fbaba9
+SHA1 (patch-aj) = 5717f8fd76f9afd270b98606ddf2b8e92f2d147d
+SHA1 (patch-ak) = fc845430558a17df57fd74f5e2e38adc30c981e8
+SHA1 (patch-al) = 2ab607628c3f010eb44831b621e017e04ba27ffd
+SHA1 (patch-am) = 408a911fa3c8d4389832cfc44532aa0abe11f42a
+SHA1 (patch-an) = ca1b3db734c701b7308f64e9321b08e37f75045b
+SHA1 (patch-ao) = ee7145bfdd837fab74d33c20996886b803f4310a
+SHA1 (patch-ap) = e2a7e4d28a7d0e911ed8432f8f3524a1eecd7398
+SHA1 (patch-aq) = bb6bcaa133ddda48ad24a94ed690afb5934b96d0
diff -r 77c60b4dd1ab -r 6a4c44f16bb0 net/uucp/patches/patch-aa
--- a/net/uucp/patches/patch-aa Sun Oct 29 23:57:48 2006 +0000
+++ b/net/uucp/patches/patch-aa Mon Oct 30 03:33:59 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/04/24 23:21:46 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2006/10/30 03:33:59 jlam Exp $
--- unix/Makefile.in.orig 2003-05-29 21:31:50.000000000 -0400
+++ unix/Makefile.in
diff -r 77c60b4dd1ab -r 6a4c44f16bb0 net/uucp/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/uucp/patches/patch-ab Mon Oct 30 03:33:59 2006 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2006/10/30 03:33:59 jlam Exp $
+
+--- chat.c.orig 2003-05-29 02:08:44.000000000 -0400
++++ chat.c
+@@ -566,6 +566,7 @@ fcsend (qconn, puuconf, z, qsys, qdial,
+ pfwrite = fconn_write;
+ zcallout_login = NULL;
+ zcallout_pass = NULL;
++ fquote = FALSE;
+
+ #if DEBUG > 1
+ if (FDEBUGGING (DEBUG_CHAT))
diff -r 77c60b4dd1ab -r 6a4c44f16bb0 net/uucp/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/uucp/patches/patch-ac Mon Oct 30 03:33:59 2006 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-ac,v 1.1 2006/10/30 03:33:59 jlam Exp $
+
+--- cu.1.orig 2003-05-29 02:08:45.000000000 -0400
++++ cu.1
+@@ -225,6 +225,11 @@ and
+ .B \-o
+ are given.
+ .TP 5
++.B (\-F, default)
++Use hardware flow control.
++.B (-f).
++Turn off hardware flow control.
++.TP 5
+ .B \-h, \-\-halfduplex
+ Echo characters locally (half-duplex mode).
+ .TP 5
+@@ -265,6 +270,11 @@ Where # is a number, equivalent to
+ .B \-n, \-\-prompt
+ Prompt for the phone number to use.
+ .TP 5
++.B \-q
++Be quiet during file transfers.
++.I cu
++is normally quite verbose.
++.TP 5
+ .B \-d
+ Enter debugging mode. Equivalent to
+ .B \-\-debug all.
diff -r 77c60b4dd1ab -r 6a4c44f16bb0 net/uucp/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/uucp/patches/patch-ad Mon Oct 30 03:33:59 2006 +0000
@@ -0,0 +1,150 @@
+$NetBSD: patch-ad,v 1.1 2006/10/30 03:33:59 jlam Exp $
+
+--- cu.c.orig 2003-05-29 02:08:45.000000000 -0400
++++ cu.c
+@@ -258,6 +258,8 @@ main (argc, argv)
+ enum txonxoffsetting txonxoff = XONXOFF_ON;
+ /* -I: configuration file name. */
+ const char *zconfig = NULL;
++ /* -F/-f: Hard/Soft flow control. */
++ boolean hflow = TRUE;
+ int iopt;
+ pointer puuconf;
+ int iuuconf;
+@@ -295,7 +297,7 @@ main (argc, argv)
+ }
+ }
+
+- while ((iopt = getopt_long (argc, argv, "a:c:deE:hnI:l:op:s:tvx:z:",
++ while ((iopt = getopt_long (argc, argv, "a:c:deE:fFhnI:l:op:qs:tvx:z:",
+ asCulongopts, (int *) NULL)) != EOF)
+ {
+ switch (iopt)
+@@ -322,6 +324,16 @@ main (argc, argv)
+ zCuvar_escape = optarg;
+ break;
+
++ case 'f':
++ /* No h/w flow control. */
++ hflow = FALSE;
++ break;
++
++ case 'F':
++ /* Use h/w flow control. */
++ hflow = TRUE;
++ break;
++
+ case 'h':
+ /* Local echo. */
+ fCulocalecho = TRUE;
+@@ -348,6 +360,11 @@ main (argc, argv)
+ zport = optarg;
+ break;
+
++ case 'q':
++ /* Quiet file transfers */
++ fCuvar_verbose = FALSE;
++ break;
++
+ case 's':
+ /* Speed. */
+ ibaud = strtol (optarg, (char **) NULL, 10);
+@@ -599,6 +616,8 @@ main (argc, argv)
+ sport.uuconf_palloc = NULL;
+ sport.uuconf_u.uuconf_sdirect.uuconf_zdevice = NULL;
+ sport.uuconf_u.uuconf_sdirect.uuconf_ibaud = ibaud;
++ sport.uuconf_u.uuconf_sdirect.uuconf_fcarrier = FALSE;
++ sport.uuconf_u.uuconf_sdirect.uuconf_fhardflow = hflow;
+
+ if (! fconn_init (&sport, &sconn, UUCONF_PORTTYPE_UNKNOWN))
+ ucuabort ();
+@@ -842,11 +861,14 @@ ucuhelp ()
+ printf (" -e: Set even parity\n");
+ printf (" -o: Set odd parity\n");
+ printf (" --parity={odd,even}: Set parity\n");
++ printf (" -f: Use hardware flow control\n");
++ printf (" -F: Turn off hardware flow control (default)\n");
+ printf (" -E,--escape char: Set escape character\n");
+ printf (" -h,--halfduplex: Echo locally\n");
+ printf (" --nostop: Turn off XON/XOFF handling\n");
+ printf (" -t,--mapcr: Map carriage return to carriage return/linefeed\n");
+ printf (" -n,--prompt: Prompt for phone number\n");
++ printf (" -q: Be quiet during file transfers\n");
+ printf (" -d: Set maximum debugging level\n");
+ printf (" -x,--debug debug: Set debugging type\n");
+ #if HAVE_TAYLOR_CONFIG
+@@ -1013,7 +1035,7 @@ fcudo_cmd (puuconf, qconn, bcmd)
+ switch (bcmd)
+ {
+ default:
+- if (! isprint (*zCuvar_escape))
++ if (! isprint (BUCHAR (*zCuvar_escape)))
+ sprintf (abescape, "\\%03o", BUCHAR (*zCuvar_escape));
+ else
+ {
+@@ -1111,7 +1133,7 @@ fcudo_cmd (puuconf, qconn, bcmd)
+ return TRUE;
+
+ case '?':
+- if (! isprint (*zCuvar_escape))
++ if (! isprint (BUCHAR (*zCuvar_escape)))
+ sprintf (abescape, "\\%03o", BUCHAR (*zCuvar_escape));
+ else
+ {
+@@ -1248,7 +1270,7 @@ icuunrecogvar (puuconf, argc, argv, pvar
+ {
+ char abescape[5];
+
+- if (! isprint (*zCuvar_escape))
++ if (! isprint (BUCHAR (*zCuvar_escape)))
+ sprintf (abescape, "\\%03o", BUCHAR (*zCuvar_escape));
+ else
+ {
+@@ -1302,7 +1324,7 @@ uculist_vars ()
+ {
+ int cchar;
+
+- if (! isprint (*z))
++ if (! isprint (BUCHAR (*z)))
+ {
+ sprintf (abchar, "\\%03o", BUCHAR (*z));
+ cchar = 4;
+@@ -1415,7 +1437,7 @@ icuunrecogfn (puuconf, argc, argv, pvar,
+ {
+ char abescape[5];
+
+- if (! isprint (*zCuvar_escape))
++ if (! isprint (BUCHAR (*zCuvar_escape)))
+ sprintf (abescape, "\\%03o", BUCHAR (*zCuvar_escape));
+ else
+ {
+@@ -2049,7 +2071,7 @@ fcusend_buf (qconn, zbufarg, cbufarg)
+ fnl = FALSE;
+ for (i = 0, zget = zbuf; i < csend; i++, zget++)
Home |
Main Index |
Thread Index |
Old Index