mirror of
https://github.com/void-linux/void-packages.git
synced 2025-04-21 08:37:02 +02:00
uucp: fix -Wimplicit-function-declaration
This commit is contained in:
parent
1b7ad0c45a
commit
e2236ebd6a
12 changed files with 203 additions and 179 deletions
|
@ -1,10 +1,8 @@
|
|||
Description: remove compiler warnings that nowadays result in errors
|
||||
Author: Thorsten Alteholz <debian@alteholz.de>
|
||||
Index: uucp/uuconv.c
|
||||
===================================================================
|
||||
--- uucp.orig/uuconv.c 2013-04-26 16:06:16.000000000 +0200
|
||||
+++ uucp/uuconv.c 2013-05-08 10:49:06.000000000 +0200
|
||||
@@ -676,7 +676,7 @@
|
||||
--- a/uuconv.c
|
||||
+++ b/uuconv.c
|
||||
@@ -676,7 +676,7 @@ uvwrite_chat_script (e, pzarg)
|
||||
{
|
||||
if ((*pz)[0] != '-' && pz != pzarg)
|
||||
fprintf (e, " ");
|
||||
|
|
38
srcpkgs/uucp/patches/implicit-function-decl.patch
Normal file
38
srcpkgs/uucp/patches/implicit-function-decl.patch
Normal file
|
@ -0,0 +1,38 @@
|
|||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -278,7 +278,7 @@ fi
|
||||
dnl
|
||||
AC_MSG_CHECKING(for void)
|
||||
AC_CACHE_VAL(uucp_cv_c_void,
|
||||
-[AC_TRY_COMPILE([], [extern void foo (); (void) exit (0);],
|
||||
+[AC_TRY_COMPILE([#include <stdlib.h>], [extern void foo (); (void) exit (0);],
|
||||
uucp_cv_c_void=yes, uucp_cv_c_void=no)])
|
||||
AC_MSG_RESULT($uucp_cv_c_void)
|
||||
if test $uucp_cv_c_void = yes; then
|
||||
@@ -318,7 +318,7 @@ dnl On some systems, memset, memcmp, and
|
||||
dnl the right number of arguments.
|
||||
AC_MSG_CHECKING(for memset)
|
||||
AC_CACHE_VAL(ac_cv_func_memset,
|
||||
-[AC_TRY_LINK([], [ char *i; int j, k; memset(i, j, k); ],
|
||||
+[AC_TRY_LINK([#include <string.h>], [ char *i; int j, k; memset(i, j, k); ],
|
||||
ac_cv_func_memset=yes, ac_cv_func_memset=no)])
|
||||
AC_MSG_RESULT($ac_cv_func_memset)
|
||||
if test $ac_cv_func_memset = yes; then
|
||||
@@ -327,7 +327,7 @@ fi
|
||||
dnl
|
||||
AC_MSG_CHECKING(for memcmp)
|
||||
AC_CACHE_VAL(ac_cv_func_memcmp,
|
||||
-[AC_TRY_LINK([], [ char *i, *j; int k; memcmp(i, j, k); ],
|
||||
+[AC_TRY_LINK([#include <string.h>], [ char *i, *j; int k; memcmp(i, j, k); ],
|
||||
ac_cv_func_memcmp=yes, ac_cv_func_memcmp=no)])
|
||||
AC_MSG_RESULT($ac_cv_func_memcmp)
|
||||
if test $ac_cv_func_memcmp = yes; then
|
||||
@@ -336,7 +336,7 @@ fi
|
||||
dnl
|
||||
AC_MSG_CHECKING(for memcpy)
|
||||
AC_CACHE_VAL(ac_cv_func_memcpy,
|
||||
-[AC_TRY_LINK([], [ char *i, *j; int k; memcpy(i, j, k); ],
|
||||
+[AC_TRY_LINK([#include <string.h>], [ char *i, *j; int k; memcpy(i, j, k); ],
|
||||
ac_cv_func_memcpy=yes, ac_cv_func_memcpy=no)])
|
||||
AC_MSG_RESULT($ac_cv_func_memcpy)
|
||||
if test $ac_cv_func_memcpy = yes; then
|
28
srcpkgs/uucp/patches/int-type.patch
Normal file
28
srcpkgs/uucp/patches/int-type.patch
Normal file
|
@ -0,0 +1,28 @@
|
|||
--- a/unix/tcp.c
|
||||
+++ b/unix/tcp.c
|
||||
@@ -37,6 +37,7 @@ const char tcp_rcsid[] = "$Id: tcp.c,v 1
|
||||
#include "system.h"
|
||||
|
||||
#include <errno.h>
|
||||
+#include <stdint.h>
|
||||
|
||||
#if HAVE_SYS_TYPES_TCP_H
|
||||
#include <sys/types.tcp.h>
|
||||
@@ -396,7 +397,7 @@ ftcp_open (qconn, ibaud, fwait, fuser, n
|
||||
while (! FGOT_SIGNAL ())
|
||||
{
|
||||
sockaddr_storage speer;
|
||||
- size_t clen;
|
||||
+ socklen_t clen;
|
||||
int onew;
|
||||
pid_t ipid;
|
||||
|
||||
@@ -614,7 +615,7 @@ ftcp_dial (qconn, puuconf, qsys, zphone,
|
||||
|
||||
sin.sin_family = AF_INET;
|
||||
sin.sin_addr.s_addr = inet_addr ((char *) zhost);
|
||||
- if ((long) sin.sin_addr.s_addr == (long) -1)
|
||||
+ if ((int32_t) sin.sin_addr.s_addr == (int32_t) -1)
|
||||
{
|
||||
ulog (LOG_ERROR, "%s: unknown host name", zhost);
|
||||
return FALSE;
|
|
@ -1,26 +1,22 @@
|
|||
Description: lintian detects some issues with these manpages
|
||||
Author: Thorsten Alteholz <debian@alteholz.de>
|
||||
Index: uucp-1.07/contrib/uurate.man
|
||||
===================================================================
|
||||
--- uucp-1.07.orig/contrib/uurate.man 2019-01-12 19:51:27.939352539 +0100
|
||||
+++ uucp-1.07/contrib/uurate.man 2019-01-12 19:51:27.927352540 +0100
|
||||
--- a/contrib/uurate.man
|
||||
+++ b/contrib/uurate.man
|
||||
@@ -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
|
||||
Index: uucp-1.07/uucp.1
|
||||
===================================================================
|
||||
--- uucp-1.07.orig/uucp.1 2019-01-12 19:51:27.939352539 +0100
|
||||
+++ uucp-1.07/uucp.1 2019-01-12 19:52:26.547350782 +0100
|
||||
--- a/uucp.1
|
||||
+++ b/uucp.1
|
||||
@@ -1,4 +1,4 @@
|
||||
-''' $Id: uucp.1,v 1.12 2002/03/05 22:13:33 ian Rel $
|
||||
+.\"''' $Id: uucp.1,v 1.12 2002/03/05 22:13:33 ian Rel $
|
||||
.TH uucp 1 "Taylor UUCP 1.07"
|
||||
.SH NAME
|
||||
uucp \- Unix to Unix copy
|
||||
@@ -67,10 +67,10 @@
|
||||
@@ -67,10 +67,10 @@ removed before being processed by the
|
||||
.I uucico
|
||||
(8) daemon, the copy will fail. The files must be readable by the
|
||||
.I uucico
|
||||
|
@ -33,17 +29,15 @@ Index: uucp-1.07/uucp.1
|
|||
.TP 5
|
||||
.B \-d, \-\-directories
|
||||
Create all necessary directories when doing the copy. This is the
|
||||
Index: uucp-1.07/uustat.1
|
||||
===================================================================
|
||||
--- uucp-1.07.orig/uustat.1 2019-01-12 19:51:27.939352539 +0100
|
||||
+++ uucp-1.07/uustat.1 2019-01-12 19:51:27.927352540 +0100
|
||||
--- a/uustat.1
|
||||
+++ b/uustat.1
|
||||
@@ -1,4 +1,4 @@
|
||||
-''' $Id: uustat.1,v 1.14 2002/03/05 22:15:10 ian Rel $
|
||||
+.\" ''' $Id: uustat.1,v 1.14 2002/03/05 22:15:10 ian Rel $
|
||||
.TH uustat 1 "Taylor UUCP 1.07"
|
||||
.SH NAME
|
||||
uustat \- UUCP status inquiry and control
|
||||
@@ -404,7 +404,7 @@
|
||||
@@ -404,7 +404,7 @@ Print a help message and exit.
|
||||
.SH EXAMPLES
|
||||
.br
|
||||
.nf
|
||||
|
@ -52,7 +46,7 @@ Index: uucp-1.07/uustat.1
|
|||
.fi
|
||||
Display status of all jobs. A sample output line is as follows:
|
||||
.br
|
||||
@@ -441,7 +441,7 @@
|
||||
@@ -441,7 +441,7 @@ options may be used to control which job
|
||||
|
||||
.br
|
||||
.nf
|
||||
|
@ -61,7 +55,7 @@ Index: uucp-1.07/uustat.1
|
|||
.fi
|
||||
Display status of queued up execution requests. A sample output line
|
||||
is as follows:
|
||||
@@ -472,7 +472,7 @@
|
||||
@@ -472,7 +472,7 @@ options may be used to control which req
|
||||
|
||||
.br
|
||||
.nf
|
||||
|
@ -70,7 +64,7 @@ Index: uucp-1.07/uustat.1
|
|||
.fi
|
||||
Display status for all systems with queued up commands. A sample
|
||||
output line is as follows:
|
||||
@@ -489,7 +489,7 @@
|
||||
@@ -489,7 +489,7 @@ and the status of that conversation.
|
||||
|
||||
.br
|
||||
.nf
|
||||
|
@ -79,7 +73,7 @@ Index: uucp-1.07/uustat.1
|
|||
.fi
|
||||
Display conversation status for all remote systems. A sample output
|
||||
line is as follows:
|
||||
@@ -509,7 +509,7 @@
|
||||
@@ -509,7 +509,7 @@ also displays the time when the next cal
|
||||
|
||||
.br
|
||||
.nf
|
||||
|
@ -88,7 +82,7 @@ Index: uucp-1.07/uustat.1
|
|||
.fi
|
||||
Display the status of all processes holding UUCP locks. The output
|
||||
format is system dependent, as
|
||||
@@ -521,7 +521,7 @@
|
||||
@@ -521,7 +521,7 @@ simply invokes
|
||||
.br
|
||||
.in +0.5i
|
||||
.nf
|
||||
|
@ -97,27 +91,23 @@ Index: uucp-1.07/uustat.1
|
|||
.fi
|
||||
.in -0.5i
|
||||
This will kill all
|
||||
Index: uucp-1.07/cu.1
|
||||
===================================================================
|
||||
--- uucp-1.07.orig/cu.1 2019-01-12 19:51:27.939352539 +0100
|
||||
+++ uucp-1.07/cu.1 2019-01-12 19:58:34.000000000 +0100
|
||||
--- a/cu.1
|
||||
+++ b/cu.1
|
||||
@@ -1,4 +1,4 @@
|
||||
-''' $Id: cu.1,v 1.10 2002/03/05 22:13:33 ian Rel $
|
||||
+.\" ''' $Id: cu.1,v 1.10 2002/03/05 22:13:33 ian Rel $
|
||||
.TH cu 1 "Taylor UUCP 1.07"
|
||||
.SH NAME
|
||||
cu \- Call up another system
|
||||
Index: uucp-1.07/uucico.8
|
||||
===================================================================
|
||||
--- uucp-1.07.orig/uucico.8 2019-01-12 19:51:27.939352539 +0100
|
||||
+++ uucp-1.07/uucico.8 2019-01-12 19:51:27.927352540 +0100
|
||||
--- a/uucico.8
|
||||
+++ b/uucico.8
|
||||
@@ -1,4 +1,4 @@
|
||||
-''' $Id: uucico.8,v 1.20 2002/03/05 22:20:48 ian Rel $
|
||||
+.\" ''' $Id: uucico.8,v 1.20 2002/03/05 22:20:48 ian Rel $
|
||||
.TH uucico 8 "Taylor UUCP 1.07"
|
||||
.SH NAME
|
||||
uucico \- UUCP file transfer daemon
|
||||
@@ -56,7 +56,7 @@
|
||||
@@ -56,7 +56,7 @@ If a call fails,
|
||||
.I uucico
|
||||
will normally refuse to retry the
|
||||
call until a certain (configurable) amount of time
|
||||
|
@ -126,7 +116,7 @@ Index: uucp-1.07/uucico.8
|
|||
.B -f,
|
||||
.B --force,
|
||||
or
|
||||
@@ -175,11 +175,11 @@
|
||||
@@ -175,11 +175,11 @@ After calling out (to a particular syste
|
||||
.B \-\-system,
|
||||
or
|
||||
.B \-S
|
||||
|
@ -140,17 +130,15 @@ Index: uucp-1.07/uucico.8
|
|||
.B \-\-loop.
|
||||
.TP 5
|
||||
.B \-q, \-\-nouuxqt
|
||||
Index: uucp-1.07/uux.1
|
||||
===================================================================
|
||||
--- uucp-1.07.orig/uux.1 2019-01-12 19:51:27.939352539 +0100
|
||||
+++ uucp-1.07/uux.1 2019-01-12 19:51:27.931352540 +0100
|
||||
--- a/uux.1
|
||||
+++ b/uux.1
|
||||
@@ -1,4 +1,4 @@
|
||||
-''' $Id: uux.1,v 1.15 2002/03/05 22:20:48 ian Rel $
|
||||
+.\" ''' $Id: uux.1,v 1.15 2002/03/05 22:20:48 ian Rel $
|
||||
.TH uux 1 "Taylor UUCP 1.07"
|
||||
.SH NAME
|
||||
uux \- Remote command execution over UUCP
|
||||
@@ -202,7 +202,7 @@
|
||||
@@ -202,7 +202,7 @@ Print a help message and exit.
|
||||
.SH EXAMPLES
|
||||
.br
|
||||
.nf
|
||||
|
@ -159,7 +147,7 @@ Index: uucp-1.07/uux.1
|
|||
.fi
|
||||
Execute the command ``rmail user1'' on the system sys1, giving it as
|
||||
standard input whatever is given to
|
||||
@@ -213,7 +213,7 @@
|
||||
@@ -213,7 +213,7 @@ as standard input. If a failure occurs,
|
||||
|
||||
.br
|
||||
.nf
|
||||
|
@ -168,17 +156,15 @@ Index: uucp-1.07/uux.1
|
|||
.fi
|
||||
Fetch the two named files from system sys1 and system sys2 and execute
|
||||
.I diff
|
||||
Index: uucp-1.07/uuxqt.8
|
||||
===================================================================
|
||||
--- uucp-1.07.orig/uuxqt.8 2019-01-12 19:51:27.939352539 +0100
|
||||
+++ uucp-1.07/uuxqt.8 2019-01-12 19:51:27.931352540 +0100
|
||||
--- a/uuxqt.8
|
||||
+++ b/uuxqt.8
|
||||
@@ -1,4 +1,4 @@
|
||||
-''' $Id: uuxqt.8,v 1.10 2002/03/05 22:20:48 ian Rel $
|
||||
+.\" ''' $Id: uuxqt.8,v 1.10 2002/03/05 22:20:48 ian Rel $
|
||||
.TH uuxqt 8 "Taylor UUCP 1.07"
|
||||
.SH NAME
|
||||
uuxqt \- UUCP execution daemon
|
||||
@@ -41,7 +41,7 @@
|
||||
@@ -41,7 +41,7 @@ Only execute requests for the specified
|
||||
.br
|
||||
.in +0.5i
|
||||
.nf
|
||||
|
|
|
@ -1,10 +1,8 @@
|
|||
Description: avoid sleeps
|
||||
Author: Frank Heckenbach
|
||||
Index: uucp-1.07/prott.c
|
||||
===================================================================
|
||||
--- uucp-1.07.orig/prott.c 2017-09-27 12:24:15.963165757 +0200
|
||||
+++ uucp-1.07/prott.c 2017-09-27 12:24:15.959165687 +0200
|
||||
@@ -88,7 +88,7 @@
|
||||
--- a/prott.c
|
||||
+++ b/prott.c
|
||||
@@ -88,7 +88,7 @@ ftstart (qdaemon, pzlog)
|
||||
zTbuf[0] = 0;
|
||||
zTbuf[1] = 0;
|
||||
fTfile = FALSE;
|
||||
|
@ -13,11 +11,17 @@ Index: uucp-1.07/prott.c
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
Index: uucp-1.07/unix/pipe.c
|
||||
===================================================================
|
||||
--- uucp-1.07.orig/unix/pipe.c 2017-09-27 12:24:15.963165757 +0200
|
||||
+++ uucp-1.07/unix/pipe.c 2017-09-27 12:24:15.959165687 +0200
|
||||
@@ -165,10 +165,43 @@
|
||||
--- a/unix/pipe.c
|
||||
+++ b/unix/pipe.c
|
||||
@@ -36,6 +36,7 @@ const char pipe_rcsid[] = "$Id: pipe.c,v
|
||||
#include "sysdep.h"
|
||||
|
||||
#include <errno.h>
|
||||
+#include <sys/wait.h>
|
||||
|
||||
#if HAVE_FCNTL_H
|
||||
#include <fcntl.h>
|
||||
@@ -164,10 +165,43 @@ fspipe_close (qconn, puuconf, qdialer, f
|
||||
if (qsysdep->ipid >= 0)
|
||||
{
|
||||
if (kill (qsysdep->ipid, SIGHUP) == 0)
|
||||
|
|
|
@ -1,10 +1,8 @@
|
|||
Description: avoid forcing hw control
|
||||
Author: Michal Suchanek
|
||||
Index: uucp-1.07/conn.h
|
||||
===================================================================
|
||||
--- uucp-1.07.orig/conn.h 2013-12-04 11:20:23.722208868 +0100
|
||||
+++ uucp-1.07/conn.h 2013-12-04 11:20:26.022181350 +0100
|
||||
@@ -117,7 +117,7 @@
|
||||
--- a/conn.h
|
||||
+++ b/conn.h
|
||||
@@ -117,7 +117,7 @@ struct sconncmds
|
||||
boolean (*pfunlock) P((struct sconnection *qconn));
|
||||
/* Open the connection. */
|
||||
boolean (*pfopen) P((struct sconnection *qconn, long ibaud,
|
||||
|
@ -13,7 +11,7 @@ Index: uucp-1.07/conn.h
|
|||
/* Close the connection. */
|
||||
boolean (*pfclose) P((struct sconnection *qconn,
|
||||
pointer puuconf,
|
||||
@@ -198,7 +198,7 @@
|
||||
@@ -198,7 +198,7 @@ extern boolean fconn_unlock P((struct sc
|
||||
than the effective permissions. */
|
||||
extern boolean fconn_open P((struct sconnection *qconn, long ibaud,
|
||||
long ihighbaud, boolean fwait,
|
||||
|
@ -22,11 +20,9 @@ Index: uucp-1.07/conn.h
|
|||
|
||||
/* Close a connection. The fsuccess argument is TRUE if the
|
||||
conversation completed normally, FALSE if it is being aborted. */
|
||||
Index: uucp-1.07/cu.c
|
||||
===================================================================
|
||||
--- uucp-1.07.orig/cu.c 2013-12-04 11:20:23.722208868 +0100
|
||||
+++ uucp-1.07/cu.c 2013-12-04 11:27:03.353425764 +0100
|
||||
@@ -223,6 +223,7 @@
|
||||
--- a/cu.c
|
||||
+++ b/cu.c
|
||||
@@ -223,6 +223,7 @@ static const struct option asCulongopts[
|
||||
{ "baud", required_argument, NULL, 's' },
|
||||
{ "mapcr", no_argument, NULL, 't' },
|
||||
{ "nostop", no_argument, NULL, 3 },
|
||||
|
@ -34,7 +30,7 @@ Index: uucp-1.07/cu.c
|
|||
{ "system", required_argument, NULL, 'z' },
|
||||
{ "config", required_argument, NULL, 'I' },
|
||||
{ "debug", required_argument, NULL, 'x' },
|
||||
@@ -258,6 +259,8 @@
|
||||
@@ -258,6 +259,8 @@ main (argc, argv)
|
||||
enum txonxoffsetting txonxoff = XONXOFF_ON;
|
||||
/* -I: configuration file name. */
|
||||
const char *zconfig = NULL;
|
||||
|
@ -43,7 +39,7 @@ Index: uucp-1.07/cu.c
|
|||
int iopt;
|
||||
pointer puuconf;
|
||||
int iuuconf;
|
||||
@@ -295,7 +298,7 @@
|
||||
@@ -295,7 +298,7 @@ main (argc, argv)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -52,7 +48,7 @@ Index: uucp-1.07/cu.c
|
|||
asCulongopts, (int *) NULL)) != EOF)
|
||||
{
|
||||
switch (iopt)
|
||||
@@ -322,6 +325,11 @@
|
||||
@@ -322,6 +325,11 @@ main (argc, argv)
|
||||
zCuvar_escape = optarg;
|
||||
break;
|
||||
|
||||
|
@ -64,7 +60,7 @@ Index: uucp-1.07/cu.c
|
|||
case 'h':
|
||||
/* Local echo. */
|
||||
fCulocalecho = TRUE;
|
||||
@@ -682,7 +690,7 @@
|
||||
@@ -682,7 +690,7 @@ main (argc, argv)
|
||||
}
|
||||
|
||||
/* Here we have locked a connection to use. */
|
||||
|
@ -73,11 +69,9 @@ Index: uucp-1.07/cu.c
|
|||
ucuabort ();
|
||||
|
||||
fCuclose_conn = TRUE;
|
||||
Index: uucp-1.07/conn.c
|
||||
===================================================================
|
||||
--- uucp-1.07.orig/conn.c 2013-12-04 11:20:23.722208868 +0100
|
||||
+++ uucp-1.07/conn.c 2013-12-04 11:20:26.026181299 +0100
|
||||
@@ -114,12 +114,13 @@
|
||||
--- a/conn.c
|
||||
+++ b/conn.c
|
||||
@@ -114,12 +114,13 @@ fconn_unlock (qconn)
|
||||
/* Open a connection. */
|
||||
|
||||
boolean
|
||||
|
@ -92,7 +86,7 @@ Index: uucp-1.07/conn.c
|
|||
{
|
||||
boolean fret;
|
||||
|
||||
@@ -177,7 +178,7 @@
|
||||
@@ -177,7 +178,7 @@ fconn_open (qconn, ibaud, ihighbaud, fwa
|
||||
else
|
||||
ulog_device (qconn->qport->uuconf_zname);
|
||||
|
||||
|
@ -101,11 +95,9 @@ Index: uucp-1.07/conn.c
|
|||
|
||||
if (! fret)
|
||||
ulog_device ((const char *) NULL);
|
||||
Index: uucp-1.07/uucico.c
|
||||
===================================================================
|
||||
--- uucp-1.07.orig/uucico.c 2013-12-04 11:20:23.722208868 +0100
|
||||
+++ uucp-1.07/uucico.c 2013-12-04 11:20:26.026181299 +0100
|
||||
@@ -695,7 +695,7 @@
|
||||
--- a/uucico.c
|
||||
+++ b/uucico.c
|
||||
@@ -683,7 +683,7 @@ main (argc, argv)
|
||||
|
||||
if (fret)
|
||||
{
|
||||
|
@ -114,7 +106,7 @@ Index: uucp-1.07/uucico.c
|
|||
fret = FALSE;
|
||||
qConn = &sconn;
|
||||
}
|
||||
@@ -714,7 +714,7 @@
|
||||
@@ -702,7 +702,7 @@ main (argc, argv)
|
||||
(struct uuconf_dialer *) NULL,
|
||||
TRUE)
|
||||
|| ! fconn_open (&sconn, (long) 0, (long) 0, TRUE,
|
||||
|
@ -123,7 +115,7 @@ Index: uucp-1.07/uucico.c
|
|||
break;
|
||||
}
|
||||
fret = FALSE;
|
||||
@@ -1176,7 +1176,7 @@
|
||||
@@ -1163,7 +1163,7 @@ fconn_call (qdaemon, qport, qstat, cretr
|
||||
}
|
||||
|
||||
if (! fconn_open (&sconn, qsys->uuconf_ibaud, qsys->uuconf_ihighbaud,
|
||||
|
@ -132,11 +124,9 @@ Index: uucp-1.07/uucico.c
|
|||
{
|
||||
terr = STATUS_PORT_FAILED;
|
||||
fret = FALSE;
|
||||
Index: uucp-1.07/unix/pipe.c
|
||||
===================================================================
|
||||
--- uucp-1.07.orig/unix/pipe.c 2013-12-04 11:20:23.722208868 +0100
|
||||
+++ uucp-1.07/unix/pipe.c 2013-12-04 11:20:26.026181299 +0100
|
||||
@@ -49,7 +49,7 @@
|
||||
--- a/unix/pipe.c
|
||||
+++ b/unix/pipe.c
|
||||
@@ -50,7 +50,7 @@ const char pipe_rcsid[] = "$Id: pipe.c,v
|
||||
|
||||
static void uspipe_free P((struct sconnection *qconn));
|
||||
static boolean fspipe_open P((struct sconnection *qconn, long ibaud,
|
||||
|
@ -145,7 +135,7 @@ Index: uucp-1.07/unix/pipe.c
|
|||
static boolean fspipe_close P((struct sconnection *qconn,
|
||||
pointer puuconf,
|
||||
struct uuconf_dialer *qdialer,
|
||||
@@ -115,11 +115,12 @@
|
||||
@@ -116,11 +116,12 @@ uspipe_free (qconn)
|
||||
|
||||
/*ARGSUSED*/
|
||||
static boolean
|
||||
|
@ -159,11 +149,9 @@ Index: uucp-1.07/unix/pipe.c
|
|||
{
|
||||
/* We don't do incoming waits on pipes. */
|
||||
if (fwait)
|
||||
Index: uucp-1.07/unix/serial.c
|
||||
===================================================================
|
||||
--- uucp-1.07.orig/unix/serial.c 2013-12-04 11:20:23.722208868 +0100
|
||||
+++ uucp-1.07/unix/serial.c 2013-12-04 11:20:26.026181299 +0100
|
||||
@@ -246,11 +246,11 @@
|
||||
--- a/unix/serial.c
|
||||
+++ b/unix/serial.c
|
||||
@@ -246,11 +246,11 @@ static boolean fsserial_open P((struct s
|
||||
boolean fwait, boolean fuser,
|
||||
enum tclocal_setting tlocal));
|
||||
static boolean fsstdin_open P((struct sconnection *qconn, long ibaud,
|
||||
|
@ -178,7 +166,7 @@ Index: uucp-1.07/unix/serial.c
|
|||
static boolean fsblock P((struct ssysdep_conn *q, boolean fblock));
|
||||
static boolean fsserial_close P((struct ssysdep_conn *q));
|
||||
static boolean fsstdin_close P((struct sconnection *qconn,
|
||||
@@ -1308,11 +1308,12 @@
|
||||
@@ -1308,11 +1308,12 @@ fsserial_open (qconn, ibaud, fwait, fuse
|
||||
call to fsblock. */
|
||||
|
||||
static boolean
|
||||
|
@ -192,7 +180,7 @@ Index: uucp-1.07/unix/serial.c
|
|||
{
|
||||
struct ssysdep_conn *q;
|
||||
|
||||
@@ -1323,6 +1324,9 @@
|
||||
@@ -1323,6 +1324,9 @@ fsstdin_open (qconn, ibaud, fwait, fuser
|
||||
q->o = q->ord;
|
||||
if (! fsserial_open (qconn, ibaud, fwait, fuser, IGNORE_CLOCAL))
|
||||
return FALSE;
|
||||
|
@ -202,7 +190,7 @@ Index: uucp-1.07/unix/serial.c
|
|||
q->iwr_flags = fcntl (q->owr, F_GETFL, 0);
|
||||
if (q->iwr_flags < 0)
|
||||
{
|
||||
@@ -1335,11 +1339,12 @@
|
||||
@@ -1335,11 +1339,12 @@ fsstdin_open (qconn, ibaud, fwait, fuser
|
||||
/* Open a modem port. */
|
||||
|
||||
static boolean
|
||||
|
@ -216,7 +204,7 @@ Index: uucp-1.07/unix/serial.c
|
|||
{
|
||||
struct uuconf_modem_port *qm;
|
||||
|
||||
@@ -1356,7 +1361,10 @@
|
||||
@@ -1356,7 +1361,10 @@ fsmodem_open (qconn, ibaud, fwait, fuser
|
||||
out, because some modems don't assert the necessary signals until
|
||||
they see carrier. Instead, we turn on hardware flow control in
|
||||
fsmodem_carrier. */
|
||||
|
@ -228,7 +216,7 @@ Index: uucp-1.07/unix/serial.c
|
|||
&& ! fsserial_hardflow (qconn, qm->uuconf_fhardflow))
|
||||
return FALSE;
|
||||
|
||||
@@ -1366,11 +1374,12 @@
|
||||
@@ -1366,11 +1374,12 @@ fsmodem_open (qconn, ibaud, fwait, fuser
|
||||
/* Open a direct port. */
|
||||
|
||||
static boolean
|
||||
|
@ -242,7 +230,7 @@ Index: uucp-1.07/unix/serial.c
|
|||
{
|
||||
struct uuconf_direct_port *qd;
|
||||
|
||||
@@ -1383,7 +1392,7 @@
|
||||
@@ -1383,7 +1392,7 @@ fsdirect_open (qconn, ibaud, fwait, fuse
|
||||
|
||||
/* Always turn on hardware flow control for a direct port when it is
|
||||
opened. There is no other sensible time to turn it on. */
|
||||
|
@ -251,11 +239,9 @@ Index: uucp-1.07/unix/serial.c
|
|||
}
|
||||
|
||||
/* Change the blocking status of the port. We keep track of the
|
||||
Index: uucp-1.07/unix/tcp.c
|
||||
===================================================================
|
||||
--- uucp-1.07.orig/unix/tcp.c 2013-12-04 11:20:23.722208868 +0100
|
||||
+++ uucp-1.07/unix/tcp.c 2013-12-04 11:20:26.026181299 +0100
|
||||
@@ -78,7 +78,7 @@
|
||||
--- a/unix/tcp.c
|
||||
+++ b/unix/tcp.c
|
||||
@@ -78,7 +78,7 @@ static boolean ftcp_set_hints P((int ive
|
||||
#endif
|
||||
static boolean ftcp_set_flags P((struct ssysdep_conn *qsysdep));
|
||||
static boolean ftcp_open P((struct sconnection *qconn, long ibaud,
|
||||
|
@ -264,7 +250,7 @@ Index: uucp-1.07/unix/tcp.c
|
|||
static boolean ftcp_close P((struct sconnection *qconn,
|
||||
pointer puuconf,
|
||||
struct uuconf_dialer *qdialer,
|
||||
@@ -208,11 +208,12 @@
|
||||
@@ -208,11 +208,12 @@ ftcp_set_flags (qsysdep)
|
||||
system. */
|
||||
|
||||
static boolean
|
||||
|
@ -278,11 +264,9 @@ Index: uucp-1.07/unix/tcp.c
|
|||
{
|
||||
struct ssysdep_conn *qsysdep;
|
||||
const char *zport;
|
||||
Index: uucp-1.07/unix/tli.c
|
||||
===================================================================
|
||||
--- uucp-1.07.orig/unix/tli.c 2013-12-04 11:20:23.722208868 +0100
|
||||
+++ uucp-1.07/unix/tli.c 2013-12-04 11:20:26.026181299 +0100
|
||||
@@ -106,7 +106,7 @@
|
||||
--- a/unix/tli.c
|
||||
+++ b/unix/tli.c
|
||||
@@ -106,7 +106,7 @@ static const char *ztlierror P((void));
|
||||
static void utli_free P((struct sconnection *qconn));
|
||||
static boolean ftli_push P((struct sconnection *qconn));
|
||||
static boolean ftli_open P((struct sconnection *qconn, long ibaud,
|
||||
|
@ -291,7 +275,7 @@ Index: uucp-1.07/unix/tli.c
|
|||
static boolean ftli_close P((struct sconnection *qconn,
|
||||
pointer puuconf,
|
||||
struct uuconf_dialer *qdialer,
|
||||
@@ -238,11 +238,12 @@
|
||||
@@ -238,11 +238,12 @@ ftli_push (qconn)
|
||||
system. */
|
||||
|
||||
static boolean
|
||||
|
@ -305,11 +289,9 @@ Index: uucp-1.07/unix/tli.c
|
|||
{
|
||||
struct ssysdep_conn *qsysdep;
|
||||
const char *zdevice;
|
||||
Index: uucp-1.07/cu.1
|
||||
===================================================================
|
||||
--- uucp-1.07.orig/cu.1 2013-12-04 11:20:23.722208868 +0100
|
||||
+++ uucp-1.07/cu.1 2013-12-04 11:20:26.026181299 +0100
|
||||
@@ -231,6 +231,9 @@
|
||||
--- a/cu.1
|
||||
+++ b/cu.1
|
||||
@@ -231,6 +231,9 @@ Echo characters locally (half-duplex mod
|
||||
.B \-\-nostop
|
||||
Turn off XON/XOFF handling (it is on by default).
|
||||
.TP 5
|
||||
|
|
|
@ -1,10 +1,8 @@
|
|||
Author: Thorsten Alteholz <debian@alteholz.de>
|
||||
Description: correct spelling error in binary
|
||||
Index: uucp-1.07/cu.c
|
||||
===================================================================
|
||||
--- uucp-1.07.orig/cu.c 2019-01-12 19:50:00.447355162 +0100
|
||||
+++ uucp-1.07/cu.c 2019-01-12 19:50:00.435355162 +0100
|
||||
@@ -1756,7 +1756,7 @@
|
||||
--- a/cu.c
|
||||
+++ b/cu.c
|
||||
@@ -1764,7 +1764,7 @@ icutake (puuconf, argc, argv, pvar, pinf
|
||||
zfrom = zbufcpy (argv[1]);
|
||||
else
|
||||
{
|
||||
|
@ -13,11 +11,9 @@ Index: uucp-1.07/cu.c
|
|||
if (zfrom == NULL)
|
||||
ucuabort ();
|
||||
zfrom[strcspn (zfrom, " \t\n")] = '\0';
|
||||
Index: uucp-1.07/uuxqt.c
|
||||
===================================================================
|
||||
--- uucp-1.07.orig/uuxqt.c 2003-05-29 08:08:48.000000000 +0200
|
||||
+++ uucp-1.07/uuxqt.c 2019-01-12 19:50:32.907354189 +0100
|
||||
@@ -1517,7 +1517,7 @@
|
||||
--- a/uuxqt.c
|
||||
+++ b/uuxqt.c
|
||||
@@ -1517,7 +1517,7 @@ uqdo_xqt_file (puuconf, zfile, zbase, qs
|
||||
az[i++] = zQcmd;
|
||||
az[i++] = "\n";
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- uucp-1.07.orig/policy.h 2003-05-29 03:08:45.000000000 -0300
|
||||
+++ uucp-1.07.orig/policy.h 2020-03-09 03:48:58.317291375 -0300
|
||||
--- a/policy.h
|
||||
+++ b/policy.h
|
||||
@@ -240,8 +240,8 @@
|
||||
the sendmail choice below. Otherwise, select one of the other
|
||||
choices as appropriate. */
|
||||
|
@ -109,3 +109,4 @@
|
|||
+#define DEBUGFILE "/var/spool/uucp/Debug"
|
||||
|
||||
#endif /* HAVE_V2_LOGGING */
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
Description: Changes from previous version
|
||||
This patch contains all changes from previous versions.
|
||||
Author: Thorsten Alteholz <debian@alteholz.de>
|
||||
--- uucp-1.07.orig/uucico.c
|
||||
+++ uucp-1.07/uucico.c
|
||||
--- a/uucico.c
|
||||
+++ b/uucico.c
|
||||
@@ -125,6 +125,9 @@ struct spass
|
||||
struct sconnection *qconn;
|
||||
};
|
||||
|
@ -33,11 +33,10 @@ Author: Thorsten Alteholz <debian@alteholz.de>
|
|||
#endif
|
||||
|
||||
while ((iopt = getopt_long (argc, argv, zopts,
|
||||
@@ -292,6 +296,14 @@ main (argc, argv)
|
||||
failed call. */
|
||||
@@ -293,6 +297,14 @@ main (argc, argv)
|
||||
fforce = TRUE;
|
||||
break;
|
||||
+
|
||||
|
||||
+ case 'g':
|
||||
+ /* Force a grade */
|
||||
+ if (isalpha(optarg[0]))
|
||||
|
@ -45,9 +44,10 @@ Author: Thorsten Alteholz <debian@alteholz.de>
|
|||
+ else
|
||||
+ fprintf (stderr, "%s: invalid grade \n", zProgram);
|
||||
+ break;
|
||||
|
||||
+
|
||||
case 'i':
|
||||
/* Type of port to use for standard input. Only TLI is
|
||||
supported here, and only if HAVE_TLI is true. This
|
||||
@@ -796,6 +808,7 @@ uhelp ()
|
||||
printf ("Usage: %s [options]\n", zProgram);
|
||||
printf (" -s,-S,--system system: Call system (-S implies -f)\n");
|
||||
|
@ -67,7 +67,7 @@ Author: Thorsten Alteholz <debian@alteholz.de>
|
|||
+ '\0' means that no restrictions have been made.
|
||||
+ If a grade is set on the command line, the calltimegrade-value
|
||||
+ is overwritten. */
|
||||
+
|
||||
+
|
||||
+ if (cmdlgrade != '\0')
|
||||
+ bgrade = cmdlgrade;
|
||||
else
|
||||
|
@ -80,8 +80,8 @@ Author: Thorsten Alteholz <debian@alteholz.de>
|
|||
|
||||
/* Determine the name we will call ourselves. */
|
||||
if (qsys->uuconf_zlocalname != NULL)
|
||||
--- uucp-1.07.orig/uucp.info-2
|
||||
+++ uucp-1.07/uucp.info-2
|
||||
--- a/uucp.info-2
|
||||
+++ b/uucp.info-2
|
||||
@@ -1,4 +1,6 @@
|
||||
-This is uucp.info, produced by makeinfo version 4.1 from uucp.texi.
|
||||
+This is uucp.info, produced by makeinfo version 4.11 from uucp.texi.
|
||||
|
@ -2396,8 +2396,8 @@ Author: Thorsten Alteholz <debian@alteholz.de>
|
|||
- system name
|
||||
- The name of the remote system.
|
||||
|
||||
--- uucp-1.07.orig/uucp.texi
|
||||
+++ uucp-1.07/uucp.texi
|
||||
--- a/uucp.texi
|
||||
+++ b/uucp.texi
|
||||
@@ -5,6 +5,8 @@
|
||||
@setchapternewpage odd
|
||||
@c %**end of header
|
||||
|
@ -2407,8 +2407,8 @@ Author: Thorsten Alteholz <debian@alteholz.de>
|
|||
@iftex
|
||||
@finalout
|
||||
@end iftex
|
||||
--- uucp-1.07.orig/uucp.info
|
||||
+++ uucp-1.07/uucp.info
|
||||
--- a/uucp.info
|
||||
+++ b/uucp.info
|
||||
@@ -1,4 +1,6 @@
|
||||
-This is uucp.info, produced by makeinfo version 4.1 from uucp.texi.
|
||||
+This is uucp.info, produced by makeinfo version 4.11 from uucp.texi.
|
||||
|
@ -2668,8 +2668,8 @@ Author: Thorsten Alteholz <debian@alteholz.de>
|
|||
+Node: Index (configuration file)338389
|
||||
|
||||
End Tag Table
|
||||
--- uucp-1.07.orig/proty.c
|
||||
+++ uucp-1.07/proty.c
|
||||
--- a/proty.c
|
||||
+++ b/proty.c
|
||||
@@ -606,12 +606,7 @@ fywait_for_packet (qdaemon, pfexit)
|
||||
#endif
|
||||
#endif
|
||||
|
@ -2683,8 +2683,8 @@ Author: Thorsten Alteholz <debian@alteholz.de>
|
|||
|
||||
static unsigned short
|
||||
iychecksum (z, c)
|
||||
--- uucp-1.07.orig/uucp.info-1
|
||||
+++ uucp-1.07/uucp.info-1
|
||||
--- a/uucp.info-1
|
||||
+++ b/uucp.info-1
|
||||
@@ -1,4 +1,6 @@
|
||||
-This is uucp.info, produced by makeinfo version 4.1 from uucp.texi.
|
||||
+This is uucp.info, produced by makeinfo version 4.11 from uucp.texi.
|
||||
|
@ -8782,30 +8782,30 @@ Author: Thorsten Alteholz <debian@alteholz.de>
|
|||
+acknowledgement for the previous file helps to eliminate the round trip
|
||||
+delays inherent in other UUCP protocols.
|
||||
+
|
||||
--- uucp-1.07.orig/unix/pipe.c
|
||||
+++ uucp-1.07/unix/pipe.c
|
||||
@@ -199,6 +199,7 @@ fspipe_dial (qconn, puuconf, qsys, zphon
|
||||
--- a/unix/pipe.c
|
||||
+++ b/unix/pipe.c
|
||||
@@ -234,6 +234,7 @@ fspipe_dial (qconn, puuconf, qsys, zphon
|
||||
struct ssysdep_conn *q;
|
||||
int aidescs[3];
|
||||
const char **pzprog;
|
||||
+ char **p;
|
||||
+ const char **p;
|
||||
|
||||
q = (struct ssysdep_conn *) qconn->psysdep;
|
||||
|
||||
@@ -211,6 +212,11 @@ fspipe_dial (qconn, puuconf, qsys, zphon
|
||||
ulog (LOG_ERROR, "No command for pipe connection");
|
||||
@@ -247,6 +248,11 @@ fspipe_dial (qconn, puuconf, qsys, zphon
|
||||
return FALSE;
|
||||
}
|
||||
+
|
||||
|
||||
+ /* Look for a string \H and replaced it by the address given for this system */
|
||||
+ for (p=pzprog; *p; p++)
|
||||
+ if (!strcmp(*p, "\\H"))
|
||||
+ *p = zphone;
|
||||
|
||||
+
|
||||
aidescs[0] = SPAWN_WRITE_PIPE;
|
||||
aidescs[1] = SPAWN_READ_PIPE;
|
||||
--- uucp-1.07.orig/contrib/uurate.c
|
||||
+++ uucp-1.07/contrib/uurate.c
|
||||
aidescs[2] = SPAWN_NULL;
|
||||
--- a/contrib/uurate.c
|
||||
+++ b/contrib/uurate.c
|
||||
@@ -216,7 +216,7 @@ struct Protocol_Summary
|
||||
struct Host_entry
|
||||
{
|
||||
|
@ -8815,8 +8815,8 @@ Author: Thorsten Alteholz <debian@alteholz.de>
|
|||
struct Execution_Command *cmds; /* Local Activities */
|
||||
struct Phone_Call call[2]; /* In & Out Activities */
|
||||
struct Protocol_Summary *proto;
|
||||
--- uucp-1.07.orig/contrib/Makefile.uurt
|
||||
+++ uucp-1.07/contrib/Makefile.uurt
|
||||
--- a/contrib/Makefile.uurt
|
||||
+++ b/contrib/Makefile.uurt
|
||||
@@ -17,9 +17,9 @@ MAN=$(prefix)/man/man1
|
||||
newconfigdir = $(prefix)/conf/uucp
|
||||
|
||||
|
@ -8830,4 +8830,3 @@ Author: Thorsten Alteholz <debian@alteholz.de>
|
|||
|
||||
SHELL=/bin/sh
|
||||
PROGS=uurate
|
||||
|
||||
|
|
|
@ -1,10 +1,8 @@
|
|||
Description: wait for correct parent to die
|
||||
Author: Jörg Sommer <joerg@jo-so.de>
|
||||
Index: uucp-1.07/unix/detach.c
|
||||
===================================================================
|
||||
--- uucp-1.07.orig/unix/detach.c 2019-03-02 16:36:11.238947732 +0100
|
||||
+++ uucp-1.07/unix/detach.c 2019-03-02 16:37:21.850946777 +0100
|
||||
@@ -98,10 +98,8 @@
|
||||
--- a/unix/detach.c
|
||||
+++ b/unix/detach.c
|
||||
@@ -98,10 +98,8 @@ usysdep_detach ()
|
||||
if (ipid != 0)
|
||||
_exit (EXIT_SUCCESS);
|
||||
|
||||
|
|
|
@ -3,11 +3,9 @@ Description:
|
|||
remove ATTRIBUTE_UNUSED of the parameter uucp-org.patch uses
|
||||
add the possibility to send the system name to be called in pipe command
|
||||
(use \Z as place holder for the system name)
|
||||
Index: uucp-1.07/unix/pipe.c
|
||||
===================================================================
|
||||
--- uucp-1.07.orig/unix/pipe.c 2019-08-17 23:06:47.774519770 +0200
|
||||
+++ uucp-1.07/unix/pipe.c 2019-08-17 23:06:47.742519770 +0200
|
||||
@@ -225,8 +225,8 @@
|
||||
--- a/unix/pipe.c
|
||||
+++ b/unix/pipe.c
|
||||
@@ -226,8 +226,8 @@ static boolean
|
||||
fspipe_dial (qconn, puuconf, qsys, zphone, qdialer, ptdialer)
|
||||
struct sconnection *qconn;
|
||||
pointer puuconf;
|
||||
|
@ -18,15 +16,7 @@ Index: uucp-1.07/unix/pipe.c
|
|||
struct uuconf_dialer *qdialer;
|
||||
enum tdialerfound *ptdialer;
|
||||
{
|
||||
@@ -246,12 +246,17 @@
|
||||
ulog (LOG_ERROR, "No command for pipe connection");
|
||||
return FALSE;
|
||||
}
|
||||
-
|
||||
- /* Look for a string \H and replaced it by the address given for this system */
|
||||
+
|
||||
+ /* Look for a string \H and replace it by the address given for this system */
|
||||
for (p=pzprog; *p; p++)
|
||||
@@ -253,6 +253,11 @@ fspipe_dial (qconn, puuconf, qsys, zphon
|
||||
if (!strcmp(*p, "\\H"))
|
||||
*p = zphone;
|
||||
|
||||
|
|
|
@ -5,6 +5,7 @@ revision=2
|
|||
build_style=gnu-configure
|
||||
configure_args="--with-newconfigdir=/etc/uucp --sbindir=/usr/bin"
|
||||
conf_files="/etc/uucp/config /etc/uucp/sys /etc/uucp/port"
|
||||
hostmakedepends="automake"
|
||||
makedepends="wget"
|
||||
short_desc="Taylor UUCP is a free implementation of UUCP"
|
||||
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
|
||||
|
@ -16,6 +17,7 @@ patch_args="-Np1"
|
|||
|
||||
system_accounts="_uucp"
|
||||
_uucp_homedir="/var/spool/uucp"
|
||||
CFLAGS="-std=c99"
|
||||
|
||||
make_dirs="
|
||||
/var/spool/uucp 0750 _uucp _uucp
|
||||
|
@ -24,7 +26,9 @@ make_dirs="
|
|||
/var/spool/uucppublic 0750 _uucp _uucp"
|
||||
|
||||
pre_configure() {
|
||||
sed -i 's|${CC-cc} -E|${CC-cc} -E|g' configure
|
||||
# sed -i 's|${CC-cc} -E|${CC-cc} -E|g' configure
|
||||
autoupdate
|
||||
autoreconf -fi
|
||||
}
|
||||
do_install() {
|
||||
make DESTDIR=${DESTDIR} install
|
||||
|
|
Loading…
Add table
Reference in a new issue