Index: Makefile =================================================================== RCS file: /cvs/ports/comms/minicom/Makefile,v retrieving revision 1.46 diff -u -p -r1.46 Makefile --- Makefile 2006/07/13 06:47:09 1.46 +++ Makefile 2007/05/17 19:17:31 @@ -2,11 +2,9 @@ COMMENT= "MS-DOS Telix-like serial communication program" -VER= 2.00.0 -DISTNAME= minicom-${VER}.src -PKGNAME= minicom-${VER}p2 +DISTNAME= minicom-2.2 CATEGORIES= comms -MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/serialcomm/dialout/} +MASTER_SITES= http://alioth.debian.org/frs/download.php/1806/ HOMEPAGE= http://alioth.debian.org/projects/minicom/ @@ -21,21 +19,14 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c ncurses -WRKDIST= ${WRKDIR}/minicom-${VER} - COPTS+= -DHAS_EUID -AUTOCONF_VERSION= 2.13 -CONFIGURE_STYLE= autoconf +CONFIGURE_STYLE= gnu CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" CONFIGURE_ARGS= --enable-cfg-dir=${SYSCONFDIR}/minicom \ - --enable-lock-dir=/var/spool/lock - -pre-configure: - @perl -pi -e "s@/usr/local/bin/@${LOCALBASE}/bin/@g;s@/sz@/lsz@g; \ - s@/sb@/lsb@g;s@/sx@/lsx@g;s@/rz@/lrz@g;s@/rb@/lrb@g; \ - s@/rx@/lrx@g" ${WRKSRC}/src/rwconf.c - + --enable-lock-dir=/var/spool/lock \ + --enable-dfl-port=/dev/cua00 \ + --enable-dfl-baud=9600 post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/minicom Index: distinfo =================================================================== RCS file: /cvs/ports/comms/minicom/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 2007/04/05 15:37:47 1.5 +++ distinfo 2007/05/17 19:17:31 @@ -1,5 +1,5 @@ -MD5 (minicom-2.00.0.src.tar.gz) = lhrKUmCH09jUb4ejIbnEWg== -RMD160 (minicom-2.00.0.src.tar.gz) = Lw54zsDkSCFe3U9QOt3ZGlbfhaw= -SHA1 (minicom-2.00.0.src.tar.gz) = y26Ks2jLgk9KrNdLpRjepZCrLZI= -SHA256 (minicom-2.00.0.src.tar.gz) = ZbquuP8jvzTW2WUTWS0ImhCnAYhBYSznytHU7zsR2bg= -SIZE (minicom-2.00.0.src.tar.gz) = 552589 +MD5 (minicom-2.2.tar.gz) = E5M8h3eDnwDjcw3yNZnckw== +RMD160 (minicom-2.2.tar.gz) = J5bnMQeFBxYMRm6VLzyfYUS5w/Q= +SHA1 (minicom-2.2.tar.gz) = dQGMKD8NA31JqT+gd6GGrd4mNWk= +SHA256 (minicom-2.2.tar.gz) = zAQGcU7Od/Wxscuehek3Ux3lVqcvlio1MsAtpBsVTWQ= +SIZE (minicom-2.2.tar.gz) = 720536 Index: patches/patch-configure_in =================================================================== RCS file: /cvs/ports/comms/minicom/patches/patch-configure_in,v retrieving revision 1.3 diff -u -p -r1.3 patch-configure_in --- patches/patch-configure_in 2005/01/06 19:51:44 1.3 +++ patches/patch-configure_in 2007/05/17 19:17:31 @@ -1,39 +0,0 @@ -$OpenBSD: patch-configure_in,v 1.3 2005/01/06 19:51:44 alek Exp $ ---- configure.in.orig 2001-09-30 07:10:33.000000000 -0600 -+++ configure.in 2004-03-23 10:50:26.000000000 -0700 -@@ -167,6 +167,7 @@ dnl Set of available languages. - ALL_LINGUAS="cs_CZ es fr fi_FI ja ja_JP.SJIS pl pt_BR ru" - - dnl Checks for programs. -+LIBS="$LIBS -liconv" - AM_GNU_GETTEXT - test "x$USE_INCLUDED_LIBINTL" = xyes && CFLAGS="$CFLAGS -I\$(top_srcdir)/intl" - -@@ -249,7 +249,7 @@ AC_CHECK_FUNC(select, - KEYSERV="", - KEYSERV="minicom.keyserv") - AC_SUBST(KEYSERV) --AC_REPLACE_FUNCS(snprintf usleep getopt getopt_long) -+AC_REPLACE_FUNCS(snprintf usleep) - - dnl system capabilities - AC_SYS_LONG_FILE_NAMES -@@ -375,6 +375,18 @@ fi - - if test "x$DFL_PORT" = x - then -+ DFL_PORT=/dev/cuaa -+ if test -c $DFL_PORT -+ then -+ AC_MSG_RESULT($DFL_PORT) -+ AC_DEFINE_UNQUOTED(DFL_PORT, "$DFL_PORT") -+ else -+ DFL_PORT="" -+ fi -+fi -+ -+if test "x$DFL_PORT" = x -+then - DFL_PORT=/dev/cua/b - if test -c $DFL_PORT - then Index: patches/patch-doc_minicom_users =================================================================== RCS file: /cvs/ports/comms/minicom/patches/patch-doc_minicom_users,v retrieving revision 1.1 diff -u -p -r1.1 patch-doc_minicom_users --- patches/patch-doc_minicom_users 2002/03/22 05:35:09 1.1 +++ patches/patch-doc_minicom_users 2007/05/17 19:17:31 @@ -1,6 +1,6 @@ -$OpenBSD: patch-doc_minicom_users,v 1.1 2002/03/22 05:35:09 form Exp $ ---- doc/minicom.users.orig Fri Mar 22 10:59:34 2002 -+++ doc/minicom.users Fri Mar 22 11:00:56 2002 +$OpenBSD$ +--- doc/minicom.users.orig Sun Mar 30 11:55:39 2003 ++++ doc/minicom.users Thu May 17 12:24:01 2007 @@ -26,7 +26,7 @@ # Index: patches/patch-lib_Makefile_in =================================================================== RCS file: /cvs/ports/comms/minicom/patches/patch-lib_Makefile_in,v retrieving revision 1.1 diff -u -p -r1.1 patch-lib_Makefile_in --- patches/patch-lib_Makefile_in 2002/03/22 05:31:37 1.1 +++ patches/patch-lib_Makefile_in 2007/05/17 19:17:31 @@ -1,30 +0,0 @@ -$OpenBSD: patch-lib_Makefile_in,v 1.1 2002/03/22 05:31:37 form Exp $ ---- lib/Makefile.in.orig Mon Oct 1 21:21:53 2001 -+++ lib/Makefile.in Fri Mar 22 08:49:30 2002 -@@ -73,7 +73,7 @@ INTLDEPS = @INTLDEPS@ - INTLLIBS = @INTLLIBS@ - INTLOBJS = @INTLOBJS@ - KEYSERV = @KEYSERV@ --LIBOBJS = @LIBOBJS@ -+LIBOBJS = @LIBOBJS@ getopt.o getopt_long.o - MAKEINFO = @MAKEINFO@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ -@@ -93,7 +93,7 @@ noinst_HEADERS = libport.h getopt.h - - libport_a_SOURCES = - --libport_a_LIBADD = @LIBOBJS@ -+libport_a_LIBADD = @LIBOBJS@ getopt.o getopt_long.o - - AUTOMAKE_OPTIONS = dist-tarZ no-dependencies 1.0 - mkinstalldirs = $(SHELL) $(top_srcdir)/aux/mkinstalldirs -@@ -106,7 +106,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.. - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ --libport_a_DEPENDENCIES = @LIBOBJS@ -+libport_a_DEPENDENCIES = @LIBOBJS@ getopt.o getopt_long.o - libport_a_OBJECTS = - AR = ar - CFLAGS = @CFLAGS@ Index: patches/patch-man_minicom_1 =================================================================== RCS file: /cvs/ports/comms/minicom/patches/patch-man_minicom_1,v retrieving revision 1.1 diff -u -p -r1.1 patch-man_minicom_1 --- patches/patch-man_minicom_1 2003/03/28 21:27:52 1.1 +++ patches/patch-man_minicom_1 2007/05/17 19:17:31 @@ -1,16 +1,13 @@ -$OpenBSD: patch-man_minicom_1,v 1.1 2003/03/28 21:27:52 rohee Exp $ - -Cross reference other minicom programs. - ---- man/minicom.1.orig Mon Mar 24 23:55:56 2003 -+++ man/minicom.1 Tue Mar 25 00:02:31 2003 -@@ -821,6 +821,9 @@ - $HOME/minicom.log +$OpenBSD$ +--- man/minicom.1.orig Thu May 17 12:29:24 2007 ++++ man/minicom.1 Thu May 17 12:31:10 2007 +@@ -812,7 +812,8 @@ $HOME/minicom.log /usr/share/locale/*/LC_MESSAGES/minicom.mo .fi -+.SH "SEE ALSO" + .SH SEE ALSO +-.BR runscript (1) +\fIascii-xfr\fP(1), +\fIrunscript\fP(1) - .SH VERSION - Minicom is now up to version 2.00.0. - .SH AUTHORS + .SH BUGS + Please report any bugs to + .IR minicom-devel@lists.alioth.debian.org . Index: patches/patch-man_runscript_1 =================================================================== RCS file: /cvs/ports/comms/minicom/patches/patch-man_runscript_1,v retrieving revision 1.1 diff -u -p -r1.1 patch-man_runscript_1 --- patches/patch-man_runscript_1 2003/03/28 21:27:52 1.1 +++ patches/patch-man_runscript_1 2007/05/17 19:17:31 @@ -1,15 +0,0 @@ -$OpenBSD: patch-man_runscript_1,v 1.1 2003/03/28 21:27:52 rohee Exp $ - -Cross reference other minicom programs. - ---- man/runscript.1.orig Tue Mar 25 00:07:34 2003 -+++ man/runscript.1 Tue Mar 25 00:08:23 2003 -@@ -163,6 +163,8 @@ - The \fBminicom\fP source code comes together with two example - scripts, \fBscriptdemo\fP and \fBunixlogin\fP. Especially the - last one is a good base to build on for your own scripts. -+.SH "SEE ALSO" -+\fIminicom\fP(1) - .SH BUGS - Runscript should be built in to minicom. - .SH AUTHOR Index: patches/patch-po_Makefile_in_in =================================================================== RCS file: /cvs/ports/comms/minicom/patches/patch-po_Makefile_in_in,v retrieving revision 1.2 diff -u -p -r1.2 patch-po_Makefile_in_in --- patches/patch-po_Makefile_in_in 2005/01/06 19:51:44 1.2 +++ patches/patch-po_Makefile_in_in 2007/05/17 19:17:31 @@ -1,30 +0,0 @@ -$OpenBSD: patch-po_Makefile_in_in,v 1.2 2005/01/06 19:51:44 alek Exp $ ---- po/Makefile.in.in.orig Mon Oct 1 16:21:48 2001 -+++ po/Makefile.in.in Thu Jan 6 12:32:27 2005 -@@ -19,7 +19,7 @@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - datadir = $(prefix)/@DATADIRNAME@ --localedir = $(datadir)/locale -+localedir = $(prefix)/share/locale - gnulocaledir = $(prefix)/share/locale - gettextsrcdir = $(prefix)/share/gettext/po - subdir = po -@@ -113,14 +113,14 @@ install-data-yes: all - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(datadir); \ - else \ -- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \ -+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ - fi - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - case "$$cat" in \ -- *.gmo) destdir=$(gnulocaledir);; \ -- *) destdir=$(localedir);; \ -+ *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \ -+ *) destdir=$(DESTDIR)$(localedir);; \ - esac; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - dir=$$destdir/$$lang/LC_MESSAGES; \ Index: patches/patch-po_ja_po =================================================================== RCS file: /cvs/ports/comms/minicom/patches/patch-po_ja_po,v retrieving revision 1.4 diff -u -p -r1.4 patch-po_ja_po --- patches/patch-po_ja_po 2002/03/22 05:35:09 1.4 +++ patches/patch-po_ja_po 2007/05/17 19:17:31 @@ -1,12 +0,0 @@ -$OpenBSD: patch-po_ja_po,v 1.4 2002/03/22 05:35:09 form Exp $ ---- po/ja.po.orig Fri Mar 22 09:17:05 2002 -+++ po/ja.po Fri Mar 22 09:17:18 2002 -@@ -10,7 +10,7 @@ msgstr "" - "Last-Translator: Tomohiro KUBOTA \n" - "Language-Team:\tJapanese\n" - "MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=euc-japanese\n" -+"Content-Type: text/plain; charset=euc-jp\n" - "Content-Transfer-Encoding: 8bit\n" - - # fputs Index: patches/patch-src_Makefile_in =================================================================== RCS file: /cvs/ports/comms/minicom/patches/patch-src_Makefile_in,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_Makefile_in --- patches/patch-src_Makefile_in 2002/03/22 05:31:37 1.1 +++ patches/patch-src_Makefile_in 2007/05/17 19:17:31 @@ -1,30 +0,0 @@ -$OpenBSD: patch-src_Makefile_in,v 1.1 2002/03/22 05:31:37 form Exp $ ---- src/Makefile.in.orig Mon Oct 1 21:21:53 2001 -+++ src/Makefile.in Fri Mar 22 10:39:46 2002 -@@ -92,7 +92,7 @@ EXTRA_PROGRAMS = minicom.keyserv - - bin_PROGRAMS = minicom runscript ascii-xfr @KEYSERV@ - --bin_SCRIPTS = xminicom -+bin_SCRIPTS = - - minicom_SOURCES = minicom.c vt100.c config.c help.c updown.c util.c dial.c window.c wkeys.c ipc.c windiv.c sysdep1.c sysdep2.c rwconf.c main.c file.c getsdir.c wildmat.c common.c - -@@ -108,14 +108,14 @@ minicom_keyserv_SOURCES = keyserv.c wkey - - AUTOMAKE_OPTIONS = dist-tarZ no-dependencies 1.0 - --minicom_LDADD = @INTLLIBS@ -+minicom_LDADD = @INTLLIBS@ ../lib/getopt.o ../lib/getopt_long.o - --runscript_LDADD = @INTLLIBS@ -+runscript_LDADD = @INTLLIBS@ ../lib/getopt.o ../lib/getopt_long.o - - LDADD = $(top_builddir)/lib/libport.a - CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/lib - --EXTRA_DIST = functions.c xminicom -+EXTRA_DIST = functions.c - mkinstalldirs = $(SHELL) $(top_srcdir)/aux/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = Index: patches/patch-src_main_c =================================================================== RCS file: patch-src_main_c diff -N patch-src_main_c --- /dev/null Sat Aug 30 18:16:59 1997 +++ patch-src_main_c Thu May 17 19:17:31 2007 @@ -0,0 +1,48 @@ +$OpenBSD$ +--- src/main.c.orig Mon Oct 31 05:13:51 2005 ++++ src/main.c Thu May 17 12:55:59 2007 +@@ -22,6 +22,9 @@ + #include "rcsid.h" + RCSID("$Id: main.c,v 1.16 2005/10/31 12:13:51 al-guest Exp $") + ++#include ++#include ++#include + #include "port.h" + #include "minicom.h" + #include "intl.h" +@@ -326,12 +329,22 @@ int open_term(int doinit) + /* Set CLOCAL mode */ + m_nohang(portfd); + ++ /* maybe, just maybe, we're looking at a GPS */ ++ do { ++ int nmeadisc = NMEADISC; ++ struct tstamps tstamps; ++ ++ tstamps.ts_set = TIOCM_CAR; ++ tstamps.ts_clr = 0; ++ ioctl(portfd, TIOCSETD, &nmeadisc); ++ ioctl(portfd, TIOCSTSTAMP, &tstamps); ++ } while (0); ++ + /* Set Hangup on Close if program crashes. (Hehe) */ + m_hupcl(portfd, 1); +- if (doinit > 0) +- m_flush(portfd); ++ if (doinit > 0) m_flush(portfd); + drop_privs(); +- return 0; ++ return(0); + } + + +@@ -476,7 +489,7 @@ void time_status(void) + if (online < 0) + wprintf(st, " %12.12s ", P_HASDCD[0] == 'Y' ? _("Offline") : _("OFFLINE")); + else +- wprintf(st, " %s %02ld:%02ld", P_HASDCD[0] == 'Y' ? _("Online") : _("ONLINE"), ++ wprintf(st, " %s %02d:%02d", P_HASDCD[0] == 'Y' ? _("Online") : _("ONLINE"), + online / 3600, (online / 60) % 60); + + ret_csr(); Index: patches/patch-src_sysdep1_c =================================================================== RCS file: /cvs/ports/comms/minicom/patches/patch-src_sysdep1_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_sysdep1_c --- patches/patch-src_sysdep1_c 2002/03/22 05:31:37 1.1 +++ patches/patch-src_sysdep1_c 2007/05/17 19:17:31 @@ -1,36 +1,38 @@ -$OpenBSD: patch-src_sysdep1_c,v 1.1 2002/03/22 05:31:37 form Exp $ ---- src/sysdep1.c.orig Sat Jun 24 23:01:29 2000 -+++ src/sysdep1.c Fri Mar 22 08:53:13 2002 -@@ -71,12 +71,12 @@ int fd, on; - void m_setrts(fd) - int fd; - { +$OpenBSD$ +--- src/sysdep1.c.orig Thu May 17 12:41:20 2007 ++++ src/sysdep1.c Thu May 17 12:43:13 2007 +@@ -80,13 +80,13 @@ void m_setrts(int fd) + if (portfd_is_socket) + return; + #endif -#if defined(TIOCM_RTS) && defined(TIOCMODG) +#if defined(TIOCM_RTS) && defined(TIOCMGET) - int mcs=0; + { + int mcs=0; -- ioctl(fd, TIOCMODG, &mcs); -+ ioctl(fd, TIOCMGET, &mcs); - mcs |= TIOCM_RTS; -- ioctl(fd, TIOCMODS, &mcs); -+ ioctl(fd, TIOCMSET, &mcs); +- ioctl(fd, TIOCMODG, &mcs); ++ ioctl(fd, TIOCMGET, &mcs); + mcs |= TIOCM_RTS; +- ioctl(fd, TIOCMODS, &mcs); ++ ioctl(fd, TIOCMSET, &mcs); + } #endif #ifdef _COHERENT - ioctl(fd, TIOCSRTS, 0); -@@ -182,10 +182,10 @@ int fd; - int m_getdcd(fd) - int fd; - { +@@ -209,11 +209,11 @@ int m_getdcd(int fd) + return portfd_is_connected; + } + #endif -#ifdef TIOCMODG +#ifdef TIOCMGET - int mcs=0; - -- ioctl(fd, TIOCMODG, &mcs); -+ ioctl(fd, TIOCMGET, &mcs); - return(mcs & TIOCM_CAR ? 1 : 0); + { + int mcs=0; + +- ioctl(fd, TIOCMODG, &mcs); ++ ioctl(fd, TIOCMGET, &mcs); + return mcs & TIOCM_CAR ? 1 : 0; + } #else - (void)fd; -@@ -223,8 +223,8 @@ int fd; +@@ -255,8 +255,8 @@ void m_savestate(int fd) ioctl(fd, TIOCLGET, &lsw); # endif #endif @@ -41,7 +43,7 @@ $OpenBSD: patch-src_sysdep1_c,v 1.1 2002 #endif } -@@ -245,8 +245,8 @@ int fd; +@@ -280,8 +280,8 @@ void m_restorestate(int fd) ioctl(fd, TIOCLSET, &lsw); # endif #endif Index: patches/patch-src_updown_c =================================================================== RCS file: /cvs/ports/comms/minicom/patches/patch-src_updown_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_updown_c --- patches/patch-src_updown_c 2002/03/22 05:31:37 1.1 +++ patches/patch-src_updown_c 2007/05/17 19:17:31 @@ -1,12 +1,21 @@ -$OpenBSD: patch-src_updown_c,v 1.1 2002/03/22 05:31:37 form Exp $ ---- src/updown.c.orig Wed Jul 4 23:27:47 2001 -+++ src/updown.c Fri Mar 22 09:02:49 2002 -@@ -245,7 +245,7 @@ int nr; +$OpenBSD$ +--- src/updown.c.orig Sun Aug 14 14:39:30 2005 ++++ src/updown.c Thu May 17 12:58:26 2007 +@@ -40,7 +40,7 @@ static int mcd(char *dir) + { + char buf[256]; + char err[50]; +- static char odir[256]; ++ static char odir[PATH_MAX]; + static int init = 0; + + if (!init) { +@@ -240,7 +240,7 @@ void updown(int what, int nr) do_log("%s", cmdline); /* jl 22.06.97 */ if (P_PFULL(g) == 'N') { - win = wopen(10, 7, 70, 13, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1); + win = wopen(5, 5, 74, 11, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1); snprintf(title, sizeof(title), _("%.30s %s - Press CTRL-C to quit"), P_PNAME(g), - what == 'U' ? _("upload") : _("download")); + what == 'U' ? _("upload") : _("download")); wtitle(win, TMID, title); Index: patches/patch-src_util_c =================================================================== RCS file: /cvs/ports/comms/minicom/patches/patch-src_util_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_util_c --- patches/patch-src_util_c 2002/03/22 05:31:37 1.1 +++ patches/patch-src_util_c 2007/05/17 19:17:31 @@ -1,9 +1,9 @@ -$OpenBSD: patch-src_util_c,v 1.1 2002/03/22 05:31:37 form Exp $ ---- src/util.c.orig Fri Mar 22 09:05:52 2002 -+++ src/util.c Fri Mar 22 09:13:15 2002 -@@ -172,11 +172,16 @@ char *cmd, *in, *out, *err; +$OpenBSD$ +--- src/util.c.orig Thu May 17 12:48:49 2007 ++++ src/util.c Thu May 17 12:48:54 2007 +@@ -178,11 +178,16 @@ int fastsystem(char *cmd, char *in, char *out, char *e /* Drop all priviliges (irreversable). */ - void drop_all_privs() + void drop_all_privs(void) { +#ifdef HAS_EUID + setegid(real_gid); @@ -18,38 +18,38 @@ $OpenBSD: patch-src_util_c,v 1.1 2002/03 /* Drop it. */ setgid(real_gid); -@@ -189,22 +194,36 @@ void drop_all_privs() +@@ -195,22 +200,36 @@ void drop_all_privs(void) /* Drop priviliges (swap uid's) */ - void drop_privs() + void drop_privs(void) { +#ifdef HAS_EUID + setegid(real_gid); + if (seteuid(real_uid) < 0) -+ fprintf(stderr, _("minicom: cannot seteuid(%d)\n"), real_uid); ++ fprintf(stderr, _("minicom: cannot seteuid(%d)\n"), real_uid); + not_suid = 1; +#else #ifdef HAS_REUID setregid(eff_gid, real_gid); if (setreuid(eff_uid, real_uid) < 0) - fprintf(stderr, _("minicom: cannot setreuid(%d, %d)\n"), eff_uid, real_uid); + fprintf(stderr, _("minicom: cannot setreuid(%d, %d)\n"), eff_uid, real_uid); not_suid = 1; #endif +#endif } /* Set priviliges (swap uid's) */ - void set_privs() + void set_privs(void) { +#ifdef HAS_EUID + setegid(eff_gid); + if (seteuid(eff_uid) < 0) -+ fprintf(stderr, _("minicom: cannot seteuid(%d)\n"), eff_uid); ++ fprintf(stderr, _("minicom: cannot seteuid(%d, %d)\n"), eff_uid); + not_suid = 0; +#else #ifdef HAS_REUID setregid(real_gid, eff_gid); if (setreuid(real_uid, eff_uid) < 0) - fprintf(stderr, _("minicom: cannot setreuid(%d, %d)\n"), real_uid, eff_uid); + fprintf(stderr, _("minicom: cannot setreuid(%d, %d)\n"), real_uid, eff_uid); not_suid = 0; +#endif #endif Index: patches/patch-src_windiv_c =================================================================== RCS file: /cvs/ports/comms/minicom/patches/patch-src_windiv_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_windiv_c --- patches/patch-src_windiv_c 2002/03/22 05:31:37 1.1 +++ patches/patch-src_windiv_c 2007/05/17 19:17:31 @@ -1,27 +1,11 @@ -$OpenBSD: patch-src_windiv_c,v 1.1 2002/03/22 05:31:37 form Exp $ ---- src/windiv.c.orig Tue Feb 1 02:12:08 2000 -+++ src/windiv.c Fri Mar 22 09:03:35 2002 +$OpenBSD$ +--- src/windiv.c.orig Thu May 17 12:50:11 2007 ++++ src/windiv.c Thu May 17 12:50:13 2007 @@ -19,6 +19,7 @@ #include "rcsid.h" - RCSID("$Id: patch-src_windiv_c,v 1.1 2002/03/22 05:31:37 form Exp $") + RCSID("$Id: windiv.c,v 1.8 2006/10/11 20:46:21 al-guest Exp $") +#include #include #include #include "port.h" -@@ -251,8 +252,14 @@ char *file_dir; - - /* get regular files */ - dirlist[nCnt].d_ino = dirent->d_ino; -- dirlist[nCnt].d_off = dirent->d_off; - dirlist[nCnt].d_reclen = dirent->d_reclen; -+#if (defined(BSD) && (BSD >= 199306)) -+ dirlist[nCnt].d_type = dirent->d_type; -+ dirlist[nCnt].d_namlen = dirent->d_namlen; -+#else -+ dirlist[nCnt].d_off = dirent->d_off; -+#endif -+ - strcpy(dirlist[nCnt].d_name, dirent->d_name ); - nMaxWidth = max(nMaxWidth, strlen(dirent->d_name)); - nCnt++; Index: patches/patch-src_window_c =================================================================== RCS file: /cvs/ports/comms/minicom/patches/patch-src_window_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_window_c --- patches/patch-src_window_c 2002/03/22 05:31:37 1.1 +++ patches/patch-src_window_c 2007/05/17 19:17:31 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_window_c,v 1.1 2002/03/22 05:31:37 form Exp $ ---- src/window.c.orig Tue Feb 1 02:12:08 2000 -+++ src/window.c Fri Mar 22 09:03:24 2002 -@@ -110,7 +110,7 @@ extern WIN *us; - - int useattr = 1; - int dirflush = 1; --extern int LINES, COLS; -+int LINES, COLS; - int usecolor = 0; - WIN *stdwin; - char *_tptr = CNULL; Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/comms/minicom/pkg/PLIST,v retrieving revision 1.16 diff -u -p -r1.16 PLIST --- pkg/PLIST 2004/09/14 23:24:39 1.16 +++ pkg/PLIST 2007/05/17 19:17:31 @@ -4,9 +4,11 @@ bin/ascii-xfr bin/minicom @mode bin/runscript +bin/xminicom @man man/man1/ascii-xfr.1 @man man/man1/minicom.1 @man man/man1/runscript.1 +@man man/man1/xminicom.1 share/doc/minicom/ share/doc/minicom/AUTHORS share/doc/minicom/Announce-1.78 @@ -22,7 +24,6 @@ share/doc/minicom/Locales share/doc/minicom/Macros share/doc/minicom/QuickStart.modemu share/doc/minicom/README.lrzsz -share/doc/minicom/RedHat share/doc/minicom/TODO.lrzsz share/doc/minicom/Todo share/doc/minicom/Todo.175 @@ -72,19 +73,23 @@ share/examples/minicom/minicom.users.sam @group @sample ${SYSCONFDIR}/minicom/minicom.users @mode -share/locale/cs_CZ/ -share/locale/cs_CZ/LC_MESSAGES/ -share/locale/cs_CZ/LC_MESSAGES/minicom.mo +share/locale/cs/LC_MESSAGES/minicom.mo +share/locale/da/LC_MESSAGES/minicom.mo +share/locale/de/LC_MESSAGES/minicom.mo share/locale/es/LC_MESSAGES/minicom.mo -share/locale/fi_FI/ -share/locale/fi_FI/LC_MESSAGES/ -share/locale/fi_FI/LC_MESSAGES/minicom.mo +share/locale/fi/LC_MESSAGES/minicom.mo share/locale/fr/LC_MESSAGES/minicom.mo +share/locale/hu/LC_MESSAGES/minicom.mo share/locale/ja/LC_MESSAGES/minicom.mo -share/locale/ja_JP.SJIS/ -share/locale/ja_JP.SJIS/LC_MESSAGES/ -share/locale/ja_JP.SJIS/LC_MESSAGES/minicom.mo +share/locale/no/LC_MESSAGES/minicom.mo share/locale/pl/LC_MESSAGES/minicom.mo share/locale/pt_BR/LC_MESSAGES/minicom.mo +share/locale/ro/LC_MESSAGES/minicom.mo share/locale/ru/LC_MESSAGES/minicom.mo +share/locale/rw/ +share/locale/rw/LC_MESSAGES/ +share/locale/rw/LC_MESSAGES/minicom.mo +share/locale/sv/LC_MESSAGES/minicom.mo +share/locale/vi/LC_MESSAGES/minicom.mo +share/locale/zh_TW/LC_MESSAGES/minicom.mo @extraunexec rm -rf ${SYSCONFDIR}/minicom/*