From 76a9a6328f89f3982d45c5b111a5082c08b5ca90 Mon Sep 17 00:00:00 2001 From: hans Date: Thu, 16 Feb 2012 17:25:16 +0000 Subject: Fix build on SunOS. --- comms/modemd/Makefile | 16 +++++++-- comms/modemd/distinfo | 13 +++---- comms/modemd/patches/patch-ab | 8 +++-- comms/modemd/patches/patch-ac | 11 +++++- comms/modemd/patches/patch-ad | 4 +-- comms/modemd/patches/patch-ag | 4 +-- comms/modemd/patches/patch-cf_sunos4.h | 55 +++++++++++++++++++++++++++++ comms/modemd/patches/patch-incoming_login.c | 12 ++++++- 8 files changed, 106 insertions(+), 17 deletions(-) create mode 100644 comms/modemd/patches/patch-cf_sunos4.h (limited to 'comms/modemd') diff --git a/comms/modemd/Makefile b/comms/modemd/Makefile index 434fbaa2ac9..5824f483f0c 100644 --- a/comms/modemd/Makefile +++ b/comms/modemd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2009/06/30 00:07:11 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2012/02/16 17:32:45 hans Exp $ DISTNAME= modemd-970221 PKGNAME= modemd-19970221 @@ -9,17 +9,27 @@ MASTER_SITES= ftp://ftp.vix.com/pub/modemd/ MAINTAINER= tsarna@NetBSD.org COMMENT= Replacement getty for dialup ttys and a modem server +USE_TOOLS+= nroff + PKG_DESTDIR_SUPPORT= user-destdir MAKE_JOBS_SAFE= no MANCOMPRESSED_IF_MANZ= yes -MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} -MAKE_ENV+= MANOWN=${MANOWN} MANGRP=${MANGRP} +MAKE_ENV+= LIBS=${LIBS:Q} +USE_BSD_MAKEFILE= yes INSTALLATION_DIRS= ${PKGMANDIR}/cat5 ${PKGMANDIR}/man5 \ ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 \ sbin share/examples/modemd +.include "../../mk/bsd.prefs.mk" +.if ${OPSYS} != "SunOS" +LIBS+= -lutil +.endif + +LIBS.SunOS+= -lsocket -lnsl +CFLAGS.SunOS+= -DFILIO_H -DNO_STRING_H -DNTELOPTS=40 + .include "../../mk/bsd.pkg.mk" diff --git a/comms/modemd/distinfo b/comms/modemd/distinfo index 9ed11ad4e64..a900c61025a 100644 --- a/comms/modemd/distinfo +++ b/comms/modemd/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.11 2011/12/19 13:25:22 wiz Exp $ +$NetBSD: distinfo,v 1.12 2012/02/16 17:32:45 hans Exp $ SHA1 (modemd-970221.tar.gz) = 104f8e596f711e349203b2da8c4f2ecf40d490c3 RMD160 (modemd-970221.tar.gz) = ade5d735e5fd07b91006cf1334a41a43dca7e3d9 Size (modemd-970221.tar.gz) = 56093 bytes SHA1 (patch-aa) = 093d70c98c5fa21f3c5fff8dc5092ca0afa365ef -SHA1 (patch-ab) = fd0382bd007ea3be2be0983db8e78a865ceb0d20 -SHA1 (patch-ac) = 55f4bf4b57e1c42becb816ac4982620c42a5bf1a -SHA1 (patch-ad) = e8c78c84b9ab58644d8e2e105416d5ef5b59fba4 +SHA1 (patch-ab) = 711b600d5dfa11e859f6af1124aaa18224b37ad3 +SHA1 (patch-ac) = fe3898ea85204631e31c49a8872855c0e7c09e9d +SHA1 (patch-ad) = f18d3ffe0658ef2709eb28d342b31361b86b1b0b SHA1 (patch-ae) = 44e38979c686f66a22e3fd3b027cb9129b6266ba SHA1 (patch-af) = c438c7ddaa223ae5bdb5b4fd11c5d6304eec4008 -SHA1 (patch-ag) = 8d93d4da055170a19336e127017dfe42501a0538 +SHA1 (patch-ag) = 3505bf5b749288de673970ea95ab3196669feca9 SHA1 (patch-ah) = 9294419cd64c3b5cc9ebadc3a4c135a0a969262d SHA1 (patch-ai) = 8e81c1e522979f616f2f4aafd5dd65400a6330fa SHA1 (patch-aj) = 2837ce9ac377aa6b4f7a8c96f63ff80fcdee9b17 @@ -22,7 +22,8 @@ SHA1 (patch-ap) = ed747dc8ef3419bc4431d934aaf4692cadd0ade4 SHA1 (patch-aq) = f77b4b16b12ca74e897372f328e850a3d9b52229 SHA1 (patch-ar) = 0fc63025d29a0bd626ec8a51f8c6a461bdbb84a4 SHA1 (patch-as) = 5ac081a2200b72321973004803d15dd3b9d387b3 -SHA1 (patch-incoming_login.c) = 9ece373aee2ea8caa751752a5390decf390eef12 +SHA1 (patch-cf_sunos4.h) = efe0b9c58ad20247cbc313c1569f9d0be8901d14 +SHA1 (patch-incoming_login.c) = 62784076e0ac1e23e2e7a6f8c248f3e1fa6b6293 SHA1 (patch-outgoing_tn.c) = 133c714eb6d33912f6edfcd12034b3155707d701 SHA1 (patch-outgoing_tnstate.c) = da65871a0397c13e1cd345c1832e3cfbe188f629 SHA1 (patch-outgoing_tnutil.c) = ef8b3f32a6e491d6fa56ba3a8f8c4ee64a368cc9 diff --git a/comms/modemd/patches/patch-ab b/comms/modemd/patches/patch-ab index cc0844c16e5..099b5480147 100644 --- a/comms/modemd/patches/patch-ab +++ b/comms/modemd/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.4 2011/11/25 21:34:34 joerg Exp $ +$NetBSD: patch-ab,v 1.5 2012/02/16 17:32:45 hans Exp $ --- common/ttio.c.orig 1997-02-21 23:06:09.000000000 +0000 +++ common/ttio.c -@@ -45,12 +45,15 @@ static char copyright[] = +@@ -45,12 +45,19 @@ static char copyright[] = #include "osdep.h" #include "cdefs.h" #include "global.h" @@ -14,7 +14,11 @@ $NetBSD: patch-ab,v 1.4 2011/11/25 21:34:34 joerg Exp $ #include "ttio.h" #include +#include ++#ifndef __sun +#include ++#else ++#include ++#endif static void dectl PROTO ((char *, int, char *, int, char *)); diff --git a/comms/modemd/patches/patch-ac b/comms/modemd/patches/patch-ac index e8de332c62b..7469f3a4893 100644 --- a/comms/modemd/patches/patch-ac +++ b/comms/modemd/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.3 2007/10/10 16:53:58 rillig Exp $ +$NetBSD: patch-ac,v 1.4 2012/02/16 17:32:45 hans Exp $ --- incoming/ppp.c.orig 1996-09-10 00:35:12.000000000 +0000 +++ incoming/ppp.c 2007-10-10 16:49:36.000000000 +0000 @@ -13,6 +13,15 @@ $NetBSD: patch-ac,v 1.3 2007/10/10 16:53:58 rillig Exp $ void ppp_detect (tty, ttyName) int tty; +@@ -79,7 +79,7 @@ void ppp_detect (tty, ttyName) + modemcap.luser = "ppp"; + modemcap.program = modemcap.ppp_prog; + modemcap.logstderr = 1; +- setlogin (ttyName); ++ SETLOGIN (ttyName); + return; + } + else @@ -125,7 +125,7 @@ void ppp_detect (tty, ttyName) if (!lbuf) error ("Can't allocate space for login string.\n"); diff --git a/comms/modemd/patches/patch-ad b/comms/modemd/patches/patch-ad index 6a236afb7b6..9d5da7ffac8 100644 --- a/comms/modemd/patches/patch-ad +++ b/comms/modemd/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.2 1998/08/07 10:36:45 agc Exp $ +$NetBSD: patch-ad,v 1.3 2012/02/16 17:32:45 hans Exp $ --- incoming/Makefile.orig Tue Sep 10 03:08:00 1996 +++ incoming/Makefile Tue Mar 3 17:19:06 1998 @@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.2 1998/08/07 10:36:45 agc Exp $ LIBDIR = ${.OBJDIR:S/incoming/common/g} DPADD = ${LIBDIR}/libmodemd.a -LDADD = ${DPADD} -+LDADD = ${DPADD} -lutil ++LDADD = ${DPADD} ${LIBS} CFLAGS += -I${.CURDIR}/.. -I${.CURDIR}/../include diff --git a/comms/modemd/patches/patch-ag b/comms/modemd/patches/patch-ag index 71c42629643..5534bad0254 100644 --- a/comms/modemd/patches/patch-ag +++ b/comms/modemd/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.2 1998/08/07 10:36:45 agc Exp $ +$NetBSD: patch-ag,v 1.3 2012/02/16 17:32:45 hans Exp $ --- outgoing/Makefile.orig Tue Sep 10 03:08:00 1996 +++ outgoing/Makefile Tue Mar 3 17:19:07 1998 @@ -7,7 +7,7 @@ $NetBSD: patch-ag,v 1.2 1998/08/07 10:36:45 agc Exp $ DPADD = ${LIBDIR}/libmodemd.a -LDADD = ${DPADD} -+LDADD = ${DPADD} -lutil ++LDADD = ${DPADD} ${LIBS} .include "../Makefile.inc" .include diff --git a/comms/modemd/patches/patch-cf_sunos4.h b/comms/modemd/patches/patch-cf_sunos4.h new file mode 100644 index 00000000000..2480ff5424c --- /dev/null +++ b/comms/modemd/patches/patch-cf_sunos4.h @@ -0,0 +1,55 @@ +$NetBSD: patch-cf_sunos4.h,v 1.1 2012/02/16 17:32:45 hans Exp $ + +--- cf/sunos4.h.orig 1997-02-22 00:06:27.000000000 +0100 ++++ cf/sunos4.h 2012-01-26 18:21:36.676350683 +0100 +@@ -70,7 +70,6 @@ + #define _PATH_UTMP "/etc/utmp" + #define _PATH_WTMP "/var/adm/wtmp" + #define _PATH_LASTLOG "/var/adm/lastlog" +-#define _PATH_MPOOL_PID "/etc/mpoold.pid" + + #define UT_NAMESIZE 8 + #define UT_LINESIZE 8 +@@ -115,6 +114,28 @@ + (warn ("%d baud not supported: using 38400", speed), \ + B38400)))))))))))))))) + ++#define NORMAL_TTY(ts) \ ++ ((ts.c_iflag |= ICRNL | IMAXBEL | BRKINT), \ ++ (ts.c_oflag |= OPOST | ONLCR), \ ++ (ts.c_cflag = (ts.c_cflag & ~CLOCAL) | HUPCL), \ ++ (ts.c_lflag |= (ICANON | ISIG | IEXTEN | ECHO | \ ++ ECHOE | ECHOKE | ECHOCTL | PENDIN)),\ ++ (ts.c_cc [VEOF] = 4), /* Control D */ \ ++ (ts.c_cc [VEOL] = _POSIX_VDISABLE), \ ++ (ts.c_cc [VEOL2] = _POSIX_VDISABLE), \ ++ (ts.c_cc [VERASE] = 127), /* Delete */ \ ++ (ts.c_cc [VWERASE] = 23), /* Control W */ \ ++ (ts.c_cc [VKILL] = 21), /* Control U */ \ ++ (ts.c_cc [VREPRINT] = 18), /* Control R */ \ ++ (ts.c_cc [VINTR] = 3), /* Control C */ \ ++ (ts.c_cc [VQUIT] = 28), /* Control \ */ \ ++ (ts.c_cc [VSUSP] = 26), /* Control Z */ \ ++ (ts.c_cc [VDSUSP] = 6), /* Control F */ \ ++ (ts.c_cc [VSTART] = 17), /* Control Q */ \ ++ (ts.c_cc [VSTOP] = 19), /* Control S */ \ ++ (ts.c_cc [VLNEXT] = 22), /* Control V */ \ ++ (ts.c_cc [VDISCARD] = _POSIX_VDISABLE)) ++ + #define SET_TX_SPEED(ts, speed) \ + (ts.c_cflag = (ts.c_cflag & ~CBAUD) | \ + CVT_BAUD (speed)) +@@ -133,8 +154,9 @@ + #define _PATH_TTYLOCK "/var/spool/locks/LCK..%s" + + /* Varargs stuff... */ +-#include +-#define VA_DOTDOTDOT va_alist +-#define VA_start(list, last) va_start (list) ++#include ++#define VA_DOTDOTDOT ... ++#define va_dcl ++#define VA_start(list, last) va_start (list, last) + +-#define vsnprintf(buf, size, fmt, list) vsprintf (buf, fmt, list) ++#define _PATH_MPOOL_PID "/var/run/mpoold.pid" diff --git a/comms/modemd/patches/patch-incoming_login.c b/comms/modemd/patches/patch-incoming_login.c index a808600b30c..4f79ecbdece 100644 --- a/comms/modemd/patches/patch-incoming_login.c +++ b/comms/modemd/patches/patch-incoming_login.c @@ -1,4 +1,4 @@ -$NetBSD: patch-incoming_login.c,v 1.1 2011/11/25 21:34:34 joerg Exp $ +$NetBSD: patch-incoming_login.c,v 1.2 2012/02/16 17:32:45 hans Exp $ --- incoming/login.c.orig 2011-11-25 20:00:14.000000000 +0000 +++ incoming/login.c @@ -10,3 +10,13 @@ $NetBSD: patch-incoming_login.c,v 1.1 2011/11/25 21:34:34 joerg Exp $ #include "mcap.h" #include "ttio.h" +@@ -70,7 +71,9 @@ void do_login (name, ttyName) + /* At this point, we have carrier, so it's time to log the login... */ + strncpy (utRec.ut_line, ttyName, UT_LINESIZE); + strncpy (utRec.ut_name, name, UT_NAMESIZE); ++#ifndef __sun + utRec.ut_host [0] = 0; ++#endif + + loginout (); + } -- cgit v1.2.3