ports/59973: [patch] mail/poppassd: Fix varargs usage (nmu)
Volker Stolz
stolz at i2.informatik.rwth-aachen.de
Fri Dec 5 12:40:17 UTC 2003
>Number: 59973
>Category: ports
>Synopsis: [patch] mail/poppassd: Fix varargs usage (nmu)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Dec 05 04:40:13 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Volker Stolz
>Release: FreeBSD 4.9-RC i386
>Organization:
Lehrstuhl für Informatik II
>Environment:
System: FreeBSD menelaos.informatik.rwth-aachen.de 4.9-RC FreeBSD 4.9-RC #10: Tue Oct 7 12:32:25 CEST 2003 root at menelaos.informatik.rwth-aachen.de:/usr/obj/usr/src/sys/MENELAOS i386
>Description:
- Fix varargs usage
- Respect $CC
- portlint, nitpicks
cc: maintainer
>How-To-Repeat:
http://bento.freebsd.org/errorlogs/i386-5-latest/poppassd-4.0_2.log
>Fix:
--- poppassd begins here ---
diff -urN /usr/ports/mail/poppassd/Makefile poppassd/Makefile
--- /usr/ports/mail/poppassd/Makefile Fri Oct 17 14:53:28 2003
+++ poppassd/Makefile Fri Dec 5 13:27:26 2003
@@ -11,26 +11,20 @@
CATEGORIES= mail
MASTER_SITES= ftp://ftp.qualcomm.com/eudora/servers/unix/password/
DISTNAME= pwserve-4
+EXTRACT_SUFX=
MAINTAINER= andrew at ugh.net.au
COMMENT= A server to allow users to change their password from within Eudora
-EXTRACT_CMD= /bin/cat
-EXTRACT_SUFX=
-EXTRACT_BEFORE_ARGS=
+EXTRACT_CMD= ${CAT}
+EXTRACT_BEFORE_ARGS=
EXTRACT_AFTER_ARGS= | ${SED} -e '1,16d' | ${SH}
WRKSRC= ${WRKDIR}/poppassd
ALL_TARGET= poppassd
MAN8= poppassd.8
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN= "Does not compile"
-.endif
-
-post-install:
- @ ${STRIP_CMD} ${PREFIX}/libexec/poppassd
+do-install:
+ @ ${INSTALL_PROGRAM} ${WRKSRC}/poppassd ${PREFIX}/libexec
@ ${INSTALL_MAN} ${FILESDIR}/poppassd.8 ${PREFIX}/man/man8/
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/mail/poppassd/files/patch-aa poppassd/files/patch-aa
--- /usr/ports/mail/poppassd/files/patch-aa Tue Jul 15 16:11:19 2003
+++ poppassd/files/patch-aa Fri Dec 5 13:13:58 2003
@@ -1,18 +1,29 @@
---- Makefile.orig Mon Jul 7 15:20:49 2003
-+++ Makefile Mon Jul 7 15:23:01 2003
-@@ -1,11 +1,11 @@
+--- Makefile.orig Fri Dec 5 13:12:35 2003
++++ Makefile Fri Dec 5 13:13:13 2003
+@@ -1,14 +1,14 @@
-BINDIR = /usr/etc
+BINDIR = ${PREFIX}/libexec
LIBDIR =
-CFLAGS = -g
-LFLAGS = -g
+-CCM = cc -Em
+CFLAGS?= -O
+LFLAGS?= ${LDFLAGS}
- CCM = cc -Em
++CCM = $(CC) -Em
OBJECTS = poppassd.o
-LIBS =
+LIBS = -lcrypt -lutil
poppassd: $(OBJECTS)
- cc -o poppassd $(LFLAGS) $(OBJECTS) $(LIBS)
+- cc -o poppassd $(LFLAGS) $(OBJECTS) $(LIBS)
++ $(CC) -o poppassd $(LFLAGS) $(OBJECTS) $(LIBS)
+
+ install: poppassd
+ install -g bin -o root -m 500 poppassd $(BINDIR)
+@@ -17,4 +17,4 @@
+ rm -f *.o *~* core Makefile.new Makefile.bak poppassd
+
+ poppassd.o: poppassd.c
+- cc -c $(CFLAGS) poppassd.c
++ $(CC) -c $(CFLAGS) poppassd.c
diff -urN /usr/ports/mail/poppassd/files/patch-ab poppassd/files/patch-ab
--- /usr/ports/mail/poppassd/files/patch-ab Fri Nov 21 13:48:01 2003
+++ poppassd/files/patch-ab Fri Dec 5 13:16:25 2003
@@ -1,5 +1,5 @@
---- poppassd.c.orig Mon Jul 7 15:15:03 2003
-+++ poppassd.c Mon Jul 7 15:17:46 2003
+--- poppassd.c.orig Fri Dec 5 13:14:06 2003
++++ poppassd.c Fri Dec 5 13:15:49 2003
@@ -13,11 +13,11 @@
*
* Doesn't actually change any passwords itself. It simply listens for
@@ -32,6 +32,15 @@
* back to the client in the final 500 response, and a new version of the
* code to find the next free pty, is by Norstad.
*
+@@ -125,7 +125,7 @@
+ #include <ctype.h>
+ #include <strings.h>
+ #include <errno.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ #include <pwd.h>
+ #include <string.h>
+ #include <termios.h>
@@ -145,8 +145,11 @@
static char *P1[] =
{"Old password:",
@@ -384,15 +393,32 @@
/*
* writestring()
*
-@@ -485,8 +398,10 @@
+@@ -485,9 +398,11 @@
}
writestring(master, pswd);
-
+ sleep(2);
if (!expect(master, P4, buf)) return FAILURE;
-+
-+ close(master);
++ close(master);
++
return SUCCESS;
}
+
+@@ -630,13 +545,11 @@
+ }
+ }
+
+-WriteToClient (fmt, va_alist)
+-char *fmt;
+-va_dcl
++WriteToClient (char *fmt, ...)
+ {
+ va_list ap;
+
+- va_start (ap);
++ va_start (ap, fmt);
+ vfprintf (stdout, fmt, ap);
+ fputs ("\r\n", stdout );
+ fflush (stdout);
--- poppassd ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list