Date: Fri, 25 Jul 2003 23:36:25 +0200 From: "Clement Laforet" <sheepkiller@cultdeadsheep.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Clement Laforet <sheepkiller@cultdeadsheep.org> Subject: ports/54871: [bento fix] net/sup: Trivial fix to unbreak it on -CURRENT. Message-ID: <20030725213501.E12BE43FBD@mx1.FreeBSD.org> Resent-Message-ID: <200307252140.h6PLe0jT023219@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 54871
>Category: ports
>Synopsis: [bento fix] net/sup: Trivial fix to unbreak it on -CURRENT.
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 25 14:40:00 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Clement Laforet
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
cotds
>Environment:
System: FreeBSD chuck.cultdeadsheep.org 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Mon Jul 14 03:00:24 CEST 2003 clement@chuck.cultdeadsheep.org:/usr/obj/usr/src/sys/CHUCK i386
>Description:
net/sup is broken on current because gcc doesn't support anymor varargs.
New file:
files/patch-quit.c
>How-To-Repeat:
Try to compile net/sup under current.
>Fix:
--- sup.diff begins here ---
diff -Nru sup.old/files/patch-quit.c sup/files/patch-quit.c
--- sup.old/files/patch-quit.c Thu Jan 1 01:00:00 1970
+++ sup/files/patch-quit.c Fri Jul 25 23:25:24 2003
@@ -0,0 +1,25 @@
+--- quit.c.orig Fri Jul 25 23:20:04 2003
++++ quit.c Fri Jul 25 23:22:08 2003
+@@ -50,17 +50,15 @@
+ */
+
+ #include <stdio.h>
+-#include <varargs.h>
++#include <stdarg.h>
+
+-quit (status, fmt, va_alist)
+-int status;
+-char *fmt;
+-va_dcl
++quit (char *fmt,...)
+ {
++ int status;
++ char *fmt;
+ va_list args;
+-
+ fflush(stdout);
+- va_start(args);
++ va_start(args,fmt);
+ (void) vfprintf(stderr, fmt, args);
+ va_end(args);
+ exit(status);
diff -Nru sup.old/files/patch-run.c sup/files/patch-run.c
--- sup.old/files/patch-run.c Fri Jul 25 23:29:01 2003
+++ sup/files/patch-run.c Fri Jul 25 23:25:04 2003
@@ -1,23 +1,46 @@
---- run.c.orig Fri Aug 20 20:46:33 1993
-+++ run.c Fri Oct 25 10:23:26 2002
-@@ -95,6 +95,7 @@
+--- run.c.orig Sat Aug 21 02:46:33 1993
++++ run.c Fri Jul 25 23:23:43 2003
+@@ -94,18 +94,17 @@
+ #include <stdio.h>
#include <signal.h>
#include <sys/wait.h>
- #include <varargs.h>
+-#include <varargs.h>
++#include <stdarg.h>
+#define MAXARGS 100
static int dorun();
-@@ -123,10 +124,14 @@
+-int run (name,va_alist)
+-char *name;
+-va_dcl
++int run (char *name,...)
+ {
+ int val;
+ va_list ap;
+
+- va_start(ap);
++ va_start(ap,name);
+ val = runv (name,ap);
+ va_end(ap);
+ return(val);
+@@ -117,16 +116,18 @@
+ return (dorun (name, argv, 0));
+ }
+
+-int runp (name,va_alist)
+-char *name;
+-va_dcl
++int runp (char *name,...)
{
int val;
va_list ap;
-
+- va_start(ap);
+- val = runvp (name,ap);
+ char *args[MAXARGS];
+ int argno=0;
+
- va_start(ap);
-- val = runvp (name,ap);
++ va_start(ap,name);
+ while (argno < MAXARGS
+ && (args[argno++] = va_arg(ap, char *)) != (char *)0);
va_end(ap);
@@ -25,7 +48,7 @@
return (val);
}
-@@ -144,7 +149,7 @@
+@@ -144,7 +145,7 @@
int wpid;
register int pid;
struct sigvec ignoresig,intsig,quitsig;
@@ -34,7 +57,7 @@
int execvp(), execv();
int (*execrtn)() = usepath ? execvp : execv;
-@@ -165,7 +170,7 @@
+@@ -165,7 +166,7 @@
sigvec (SIGINT,&ignoresig,&intsig);
sigvec (SIGQUIT,&ignoresig,&quitsig);
do {
@@ -43,7 +66,7 @@
if (WIFSTOPPED (status)) {
kill (0,SIGTSTP);
wpid = 0;
-@@ -174,8 +179,8 @@
+@@ -174,8 +175,8 @@
sigvec (SIGINT,&intsig,0); /* restore signals */
sigvec (SIGQUIT,&quitsig,0);
--- sup.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030725213501.E12BE43FBD>