cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to 2.00.0

Browse Source
This commit is contained in:
form 2002-03-22 05:31:37 +00:00
parent 38d1ceefd4
commit 172424f044
29 changed files with 312 additions and 536 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
comms/minicom/Makefile
View File

@ -1,37 +1,54 @@
# $OpenBSD: Makefile,v 1.33 2002/03/21 20:46:23 espie Exp $
# $OpenBSD: Makefile,v 1.34 2002/03/22 05:31:37 form Exp $
COMMENT= "MS-DOS Telix-like serial communication program"
COMMENT= "MS-DOS Telix-like serial communication program"
DISTNAME= ${PKGNAME}.src
PKGNAME= minicom-1.83.1
CATEGORIES= comms
NEED_VERSION= 1.515
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/serialcomm/dialout
DISTNAME= ${PKGNAME}.src
PKGNAME= minicom-2.00.0
CATEGORIES= comms
NEED_VERSION= 1.515
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/serialcomm/dialout
HOMEPAGE= http://www.pp.clinet.fi/~walker/minicom.html
HOMEPAGE= http://www.pp.clinet.fi/~walker/minicom.html
MODULES= gettext
RUN_DEPENDS= ::comms/kermit \
::comms/lrzsz
MODULES= gettext
RUN_DEPENDS= ::comms/kermit \
::comms/lrzsz
MAINTAINER= Oleg Safiullin <form@openbsd.org>
MAINTAINER= Oleg Safiullin <form@openbsd.org>
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WRKDIST= ${WRKDIR}/${PKGNAME}/src
WRKDIST= ${WRKDIR}/${PKGNAME}
COPTS= -DHAS_EUID
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= --enable-cfg-dir=${SYSCONFDIR}/minicom \
--enable-lock-dir=/var/spool/lock
post-patch:
@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
pre-build:
@mv ${WRKBUILD}/xminicom ${WRKBUILD}/xminicom.orig
@sed -e "s,@PREFIX@,${PREFIX},g" -e "s,@X11BASE@,${X11BASE},g" \
${FILESDIR}/xminicom.in > ${WRKBUILD}/xminicom
post-install:
@chown uucp:dialer ${PREFIX}/bin/minicom
@chmod 4111 ${PREFIX}/bin/minicom
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/minicom
${INSTALL_DATA} ${WRKBUILD}/minicom.users \
${PREFIX}/share/examples/minicom
${INSTALL_DATA} ${WRKDIST}/doc/minicom.users \
${PREFIX}/share/examples/minicom/minicom.users.sample
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/minicom
${INSTALL_DATA} ${WRKDIST}/doc/* ${PREFIX}/share/doc/minicom
@rm ${PREFIX}/share/doc/minicom/Makefile*
${INSTALL_DATA} ${WRKDIST}/AUTHORS ${PREFIX}/share/doc/minicom
${INSTALL_DATA} ${WRKDIST}/COPYING ${PREFIX}/share/doc/minicom
${INSTALL_DATA} ${WRKDIST}/ChangeLog ${PREFIX}/share/doc/minicom
@(umask 022; cp -RP ${WRKDIST}/extras ${PREFIX}/share/examples/minicom)
@find ${PREFIX}/share/examples/minicom -name Makefile\* \
-exec rm -f {} \;
.include <bsd.port.mk>

6
comms/minicom/distinfo
View File

@ -1,3 +1,3 @@
MD5 (minicom-1.83.1.src.tar.gz) = 54311e7ab398a87088eafbe5e7c09cad
RMD160 (minicom-1.83.1.src.tar.gz) = 146fb703c12fd9bd09f17379f5dcd10e284d64f5
SHA1 (minicom-1.83.1.src.tar.gz) = 0c1c7fd8c95304c47c0c106f54b997f2d320c883
MD5 (minicom-2.00.0.src.tar.gz) = cfae090b087b67ed04e124ab5c658e70
RMD160 (minicom-2.00.0.src.tar.gz) = 8e390920b6e942d0407605b69938b77dfedb68bb
SHA1 (minicom-2.00.0.src.tar.gz) = 3094f35e041c2c32cdb26860bc32735be9865265

15
comms/minicom/files/xminicom.in
View File

@ -1,15 +0,0 @@
#!/bin/sh
#
# $OpenBSD: xminicom.in,v 1.1 2000/05/18 04:41:30 form Exp $
#
# Run minicom in X-Windows environment
#
XTERM=@X11BASE@/bin/xterm
if [ -x ${XTERM} ]; then
exec ${XTERM} -fg grey -bg black -n minicom -T minicom -geometry 80x25 \
-e @PREFIX@/bin/minicom -m -c on $*
fi
echo "xminicom: can't execute ${XTERM}" >&2
exit 1

88
comms/minicom/patches/patch-Makefile
View File

@ -1,88 +0,0 @@
$OpenBSD: patch-Makefile,v 1.2 2001/10/12 03:30:30 brad Exp $
--- Makefile.orig Tue Apr 25 11:42:32 2000
+++ Makefile Thu Oct 11 23:07:46 2001
@@ -22,10 +22,13 @@
# enochw@scn.org Oct 99: flags for UWIN 2.0 (Unix for Windows)
# Where to install things for Linux sites (FSSTND)
-BINDIR = /usr/bin
-LIBDIR = /etc
-DOCDIR = /usr/doc/minicom
-MANDIR = /usr/man/man1
+R = $(DESTDIR)
+PREFIX ?= /usr/local
+BINDIR = $(PREFIX)/bin
+LIBDIR = /etc/minicom
+DOCDIR = $(PREFIX)/share/doc/minicom
+MANDIR = $(PREFIX)/man/man1
+LOCALEDIR = $(PREFIX)/share/locale
# fmg 8/22/97: seems a more logical place for this :-)
# Select Compile Options you want:
@@ -60,11 +63,11 @@ PO = po
# MANDIR = /usr/local/man/man1
# Take these compilation flags for Linux with libncurses.
-FLAGS = -Wall -D_POSIX -D_SYSV -D_SELECT -pipe # -I/usr/include/ncurses
-PROGS = minicom runscript ascii-xfr
-LFLAGS = -s
-LIBS = -lncurses #-lintl
-CC = cc
+#FLAGS = -Wall -D_POSIX -D_SYSV -D_SELECT -pipe # -I/usr/include/ncurses
+#PROGS = minicom runscript ascii-xfr
+#LFLAGS = -s
+#LIBS = -lncurses #-lintl
+#CC = cc
# Take these compilation flags for FreeBSD.
#FLAGS = -Wall -D_POSIX -D_BSD43 -D_SELECT -D_DCDFLOW
@@ -73,6 +76,13 @@ CC = cc
#LIBS = -ltermcap
#CC = cc
+# Take these compilation flags for OpenBSD.
+FLAGS = -Wall -D_POSIX -D_BSD43 -D_SELECT -D_DCDFLOW
+PROGS = minicom runscript ascii-xfr
+LFLAGS = -s -L$(LOCALBASE)/lib
+LIBS = -lcurses -lintl
+#CC = cc
+
# Take these flags for SCO unix.
#FLAGS = -D_SYSV -D_SCO -D_POSIX -D_SELECT
#PROGS = minicom runscript ascii-xfr
@@ -199,7 +209,7 @@ KOBJS = keyserv.o wkeys.o sysdep2.o
SOBJS = script.o sysdep1.o common.o
# fmg 8/22/97: merge in new OPFLAGS...
-CFLAGS = $(FLAGS) $(OPFLAGS) -DLIBDIR=\"$(LIBDIR)\"
+CFLAGS += $(FLAGS) $(OPFLAGS) -DLIBDIR=\"$(LIBDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\" -I$(LOCALBASE)/include
R = $(ROOTDIR)
@@ -209,7 +219,7 @@ minicom: $(MOBJS)
$(CC) $(LFLAGS) -o minicom $(MOBJS) $(LIBS)
po: dummy
- $(MAKE) -C po
+ @cd po; $(MAKE)
keyserv: $(KOBJS)
$(CC) -o keyserv $(LFLAGS) $(KOBJS) $(LIBS)
@@ -262,7 +272,7 @@ rwconf.o: rwconf.c $(HDRS)
dummy:
install: $(PROGS)
- $(MAKE) -C po install R=$(R)
+ @cd po; $(MAKE) install PREFIX=$(PREFIX)
sh install.sh $(R)$(LIBDIR) $(R)$(BINDIR) $(R)$(MANDIR) $(R)$(DOCDIR)
install2: $(PROGS)
@@ -270,7 +280,7 @@ install2: $(PROGS)
clobber:
rm -f *.o *~ minicom keyserv runscript ascii-xfr
- $(MAKE) -C po clean
+ @cd po; $(MAKE) clean
clean:
rm -f *.o

14
comms/minicom/patches/patch-ascii-xfr_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-ascii-xfr_c,v 1.1 2001/10/12 02:49:03 brad Exp $
--- ascii-xfr.c.orig Sun Mar 8 11:10:26 1998
+++ ascii-xfr.c Thu Oct 11 22:16:04 2001
@@ -14,6 +14,10 @@
#include <string.h>
#include <time.h>
#include <fcntl.h>
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
+#include <sys/param.h> /* get BSD definition if present */
+#endif
+
/*
* Externals.

19
comms/minicom/patches/patch-config_h
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-config_h,v 1.1 2001/10/12 02:49:03 brad Exp $
--- config.h.orig Wed Mar 15 11:25:21 2000
+++ config.h Thu Oct 11 22:16:04 2001
@@ -67,6 +67,15 @@
# define CALLIN ""
#endif
+#ifdef __OpenBSD__
+# define DFL_PORT "/dev/tty00"
+# define DEF_BAUD "57600"
+# define CALLOUT ""
+# define CALLIN ""
+# undef UUCPLOCK
+# define UUCPLOCK "/var/spool/lock"
+#endif
+
/* Some reasonable defaults if not defined */
#ifndef DFL_PORT
# define DFL_PORT "/dev/tty8"

12
comms/minicom/patches/patch-configure_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure_in,v 1.1 2002/03/22 05:31:37 form Exp $
--- configure.in.orig Sun Sep 30 20:10:33 2001
+++ configure.in Fri Mar 22 08:46:21 2002
@@ -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

111
comms/minicom/patches/patch-install_sh
View File

@ -1,111 +0,0 @@
$OpenBSD: patch-install_sh,v 1.1 2001/10/12 02:49:03 brad Exp $
--- install.sh.orig Wed Mar 15 11:25:21 2000
+++ install.sh Thu Oct 11 22:16:04 2001
@@ -15,20 +15,20 @@ then
exit 1
fi
-for i in $*
-do
- mkdir -p $i
-done
-
-if test ! -d $1
-then
- mkdir -p $1
- if [ $? != 0 ]
- then
- echo "$1: No such directory"
- exit 1
- fi
-fi
+#for i in $*
+#do
+# mkdir -p $i
+#done
+
+#if test ! -d $1
+#then
+# mkdir -p $1
+# if [ $? != 0 ]
+# then
+# echo "$1: No such directory"
+# exit 1
+# fi
+#fi
if test ! -d $2
then
@@ -47,7 +47,7 @@ then
echo "Installing minicom in $2"
cp minicom $2/minicom
chown root $2/minicom
- chgrp uucp $2/minicom
+ chgrp wheel $2/minicom
chmod 755 $2/minicom
fi
@@ -59,18 +59,18 @@ do
cp $i $2/$i
chmod 755 $2/$i
chown root $2/$i
- chgrp root $2/$i
+ chgrp wheel $2/$i
fi
done
-if test -f keyserv
-then
- echo "Installing keyserv in $1"
- cp keyserv $1/keyserv
- chmod 755 $1/keyserv
- chown root $1/keyserv
- chgrp root $1/keyserv
-fi
+#if test -f keyserv
+#then
+# echo "Installing keyserv in $1"
+# cp keyserv $1/keyserv
+# chmod 755 $1/keyserv
+# chown root $1/keyserv
+# chgrp wheel $1/keyserv
+#fi
echo "Installing manpages in $3"
for i in minicom.1 runscript.1 ascii-xfr.1
@@ -78,17 +78,17 @@ do
cp ../man/$i $3
chmod 644 $3/$i
chown root $3/$i
- chgrp root $3/$i
+ chgrp wheel $3/$i
done
-if [ ! -f $1/minicom.users ]
-then
- echo "Installing sample config file minicom.users in $1"
- cp minicom.users $1
- chown root $1/minicom.users
- chgrp root $1/minicom.users
- chmod 644 $1/minicom.users
-fi
+#if [ ! -f $1/minicom.users ]
+#then
+# echo "Installing sample config file minicom.users in $1"
+# cp minicom.users $1
+# chown root $1/minicom.users
+# chgrp wheel $1/minicom.users
+# chmod 644 $1/minicom.users
+#fi
mkdir -p $4 2>/dev/null
@@ -101,7 +101,7 @@ then
chmod -f 644 $4/* $4/demos/* $4/tables/*
chmod -f a+x $4/demos $4/tables
chown -f root $4/* $4/demos/* $4/tables/*
- chgrp -f root $4/* $4/demos/* $4/tables/*
+ chgrp -f wheel $4/* $4/demos/* $4/tables/*
else
echo "You don't have a $4 directory - script examples not installed."
fi

30
comms/minicom/patches/patch-lib_Makefile_in Normal file
View File

@ -0,0 +1,30 @@
$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@

12
comms/minicom/patches/patch-minicom_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-minicom_c,v 1.1 2001/10/12 03:30:30 brad Exp $
--- minicom.c.orig Thu Oct 11 22:57:04 2001
+++ minicom.c Thu Oct 11 22:57:25 2001
@@ -899,7 +899,7 @@ char **argv;
/* char* console_encoding = getenv ("LC_CTYPE"); */
#ifdef _I18N_
- bindtextdomain("minicom", "/usr/share/locale");
+ bindtextdomain("minicom", LOCALEDIR);
textdomain("minicom");
#endif

15
comms/minicom/patches/patch-minicom_users
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-minicom_users,v 1.1 2001/10/12 02:49:03 brad Exp $
--- minicom.users.orig Thu Jan 18 11:08:02 1996
+++ minicom.users Thu Oct 11 22:16:05 2001
@@ -26,7 +26,10 @@
#
# Everyone has access to all configurations.
-ALL
+# ALL
+
+# Only root can access minicom by default
+root
## The rest are examples.
## # Erik only has access to the default configuration

38
comms/minicom/patches/patch-po_Makefile
View File

@ -1,38 +0,0 @@
$OpenBSD: patch-po_Makefile,v 1.1 2001/10/12 02:49:03 brad Exp $
--- po/Makefile.orig Fri Feb 18 12:33:40 2000
+++ po/Makefile Thu Oct 11 22:16:05 2001
@@ -1,7 +1,7 @@
INSTALL= /usr/bin/install -c
INSTALL_PROGRAM= ${INSTALL}
INSTALL_DATA= ${INSTALL} -m 644
-INSTALLNLSDIR=/usr/share/locale
+INSTALLNLSDIR= $(PREFIX)/share/locale
MSGMERGE = msgmerge
@@ -52,19 +52,20 @@ depend:
install: $(CATALOGS)
for n in $(CATALOGS); do \
l=`basename $$n .mo`; \
- $(INSTALL) -m 755 -d $(R)$(INSTALLNLSDIR)/$$l; \
- $(INSTALL) -m 755 -d $(R)$(INSTALLNLSDIR)/$$l/LC_MESSAGES; \
- $(INSTALL) -m 644 $$n $(R)$(INSTALLNLSDIR)/$$l/LC_MESSAGES/minicom.mo; \
+ $(INSTALL) -m 755 -d $(INSTALLNLSDIR)/$$l; \
+ $(INSTALL) -m 755 -d $(INSTALLNLSDIR)/$$l/LC_MESSAGES; \
+ $(INSTALL) -m 644 $$n $(INSTALLNLSDIR)/$$l/LC_MESSAGES/minicom.mo; \
done
-%.mo: %.po
+.SUFFIXES: .po .mo
+.po.mo:
msgfmt -o $@ $<
# Automatically make ja_JP.SJIS.po from ja.po
# ujis2sjis is a converting program.
ja_JP.SJIS.po : ja.po ujis2sjis
- ./ujis2sjis <ja.po >ja_JP.SJIS.po
+ ./ujis2sjis <ja.po | sed 's/charset=euc-jp/charset=sjis/' >ja_JP.SJIS.po
ujis2sjis : ujis2sjis.c
cc $< -o $@

21
comms/minicom/patches/patch-po_Makefile_in_in Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-po_Makefile_in_in,v 1.1 2002/03/22 05:31:37 form Exp $
--- po/Makefile.in.in.orig Fri Mar 22 10:11:31 2002
+++ po/Makefile.in.in Fri Mar 22 10:14:11 2002
@@ -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; \

12
comms/minicom/patches/patch-po_ja_po
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-po_ja_po,v 1.2 2001/10/12 02:49:03 brad Exp $
--- po/ja.po.orig Wed May 10 14:23:42 2000
+++ po/ja.po Thu Oct 11 22:16:05 2001
@@ -10,7 +10,7 @@ msgstr ""
"Last-Translator: Tomohiro KUBOTA <kubota@debian.or.jp>\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"
# c-format(fprintf)

48
comms/minicom/patches/patch-po_ko_po
View File

@ -1,48 +0,0 @@
$OpenBSD: patch-po_ko_po,v 1.2 2001/10/12 02:49:03 brad Exp $
--- po/ko.po.orig Thu Mar 16 05:14:29 2000
+++ po/ko.po Thu Oct 11 22:16:06 2001
@@ -128,7 +128,7 @@ msgstr " 아니오 "
# ../minicom.c:53 ../minicom.c:54
#: ../minicom.c:53 ../minicom.c:54
msgid " Close "
-msgstr "<22> 닫기 "
+msgstr " 닫기 "
# ../minicom.c:53
#: ../minicom.c:53
@@ -914,7 +914,7 @@ msgstr " J - 배경색 (상태) :"
# ../config.c:712
#: ../config.c:806
msgid " K - History Buffer Size :"
-msgstr " K - History 영역 크기<ED81AC> :"
+msgstr " K - History 영역 크기 :"
# ../config.c:713
#: ../config.c:807
@@ -1092,7 +1092,7 @@ msgstr "매크로를 읽어들입니다"
# ../config.c:1035
#: ../config.c:1131
msgid " A - Terminal emulation :"
-msgstr " A - <20>터미널 종류 :"
+msgstr " A - 터미널 종류 :"
# ../config.c:1036
#: ../config.c:1132
@@ -1989,7 +1989,7 @@ msgstr "다른 기능들"
#: ../help.c:46
#, fuzzy
msgid " Dialing directory..D run script (Go)....G | Clear Screen.......C\n"
-msgstr " <20>다이얼...........D 스크립트 실행.....G | 화면 소거.........C\n"
+msgstr " 다이얼...........D 스크립트 실행.....G | 화면 소거.........C\n"
# ../help.c:47
# wputs
@@ -2036,7 +2036,7 @@ msgstr " break를 송신........F 모뎀 초<>
#: ../help.c:56
#, fuzzy
msgid " Terminal settings..T run Kermit.........K | Cursor key mode....I\n"
-msgstr " <20>터미널 설정...T Kermit를 실행......K | 커서 키 모드....I\n"
+msgstr " 터미널 설정...T Kermit를 실행......K | 커서 키 모드....I\n"
# ../help.c:57
# wputs

11
comms/minicom/patches/patch-po_ujis2sjis_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-po_ujis2sjis_c,v 1.2 2001/10/12 02:49:03 brad Exp $
--- po/ujis2sjis.c.orig Mon Aug 3 10:43:02 1998
+++ po/ujis2sjis.c Thu Oct 11 22:16:06 2001
@@ -33,7 +33,6 @@ int decode_line(unsigned char buf[],int
c=ujis2sjis((kanji&127)-32,(*p&127)-32);
c1=c>>8; c2=c&255;
putchar(c1); putchar(c2);
- if (c2=='\\') putchar('\\');
if (c2=='%' && format) putchar('%');
kanji=0;
} else {

16
comms/minicom/patches/patch-port_h
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-port_h,v 1.1 2001/10/12 02:49:03 brad Exp $
--- port.h.orig Mon Apr 24 09:31:59 2000
+++ port.h Thu Oct 11 22:16:06 2001
@@ -105,7 +105,11 @@
/* Availability of setreuid(uid_t, uid_t) */
#if defined(__linux__) || defined(_BSD43) || (defined(BSD) && (BSD >= 199103))
-# define HAS_REUID
+# ifdef __OpenBSD__
+# define HAS_EUID
+# else
+# define HAS_REUID
+# endif
#endif
/* Availability of fchown(int, uid_t, gid_t) */

22
comms/minicom/patches/patch-rwconf_c
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-rwconf_c,v 1.1 2001/10/12 02:49:03 brad Exp $
--- rwconf.c.orig Thu Jun 1 13:19:11 2000
+++ rwconf.c Thu Oct 11 22:16:06 2001
@@ -83,12 +83,12 @@ struct pars mpars[] = {
{ "/usr/bin/kermit -i -l %l -r", PUBLIC, "pprog8" },
#else
/* Most sites have this in /usr/local, except Linux. */
- { "/usr/local/bin/sz -vv", PUBLIC, "pprog1" },
- { "/usr/local/bin/sb -vv", PUBLIC, "pprog2" },
- { "/usr/local/bin/sx -vv", PUBLIC, "pprog3" },
- { "/usr/local/bin/rz -vv", PUBLIC, "pprog4" },
- { "/usr/local/bin/rb -vv", PUBLIC, "pprog5" },
- { "/usr/local/bin/rx -vv", PUBLIC, "pprog6" },
+ { "/usr/local/bin/lsz -vv", PUBLIC, "pprog1" },
+ { "/usr/local/bin/lsb -vv", PUBLIC, "pprog2" },
+ { "/usr/local/bin/lsx -vv", PUBLIC, "pprog3" },
+ { "/usr/local/bin/lrz -vv", PUBLIC, "pprog4" },
+ { "/usr/local/bin/lrb -vv", PUBLIC, "pprog5" },
+ { "/usr/local/bin/lrx -vv", PUBLIC, "pprog6" },
{ "/usr/local/bin/kermit -i -l %l -s", PUBLIC, "pprog7" },
{ "/usr/local/bin/kermit -i -l %l -r", PUBLIC, "pprog8" },
#endif

12
comms/minicom/patches/patch-script_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-script_c,v 1.1 2001/10/12 03:30:30 brad Exp $
--- script.c.orig Thu Oct 11 22:56:06 2001
+++ script.c Thu Oct 11 22:56:20 2001
@@ -962,7 +962,7 @@ char **argv;
#endif
#ifdef _I18N_
- bindtextdomain("minicom", "/usr/share/locale");
+ bindtextdomain("minicom", LOCALEDIR);
textdomain("minicom");
#endif

30
comms/minicom/patches/patch-src_Makefile_in Normal file
View File

@ -0,0 +1,30 @@
$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 =

54
comms/minicom/patches/patch-src_sysdep1_c Normal file
View File

@ -0,0 +1,54 @@
$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;
{
-#if defined(TIOCM_RTS) && defined(TIOCMODG)
+#if defined(TIOCM_RTS) && defined(TIOCMGET)
int mcs=0;
- 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;
{
-#ifdef TIOCMODG
+#ifdef TIOCMGET
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;
ioctl(fd, TIOCLGET, &lsw);
# endif
#endif
-#ifdef TIOCMODG
- ioctl(fd, TIOCMODG, &m_word);
+#ifdef TIOCMGET
+ ioctl(fd, TIOCMGET, &m_word);
#endif
}
@@ -245,8 +245,8 @@ int fd;
ioctl(fd, TIOCLSET, &lsw);
# endif
#endif
-#ifdef TIOCMODS
- ioctl(fd, TIOCMODS, &m_word);
+#ifdef TIOCMSET
+ ioctl(fd, TIOCMSET, &m_word);
#endif
}

10
comms/minicom/patches/patch-updown_c → comms/minicom/patches/patch-src_updown_c
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-updown_c,v 1.1 2001/10/12 02:49:03 brad Exp $
--- updown.c.orig Thu Mar 16 04:44:26 2000
+++ updown.c Thu Oct 11 22:16:06 2001
@@ -238,7 +238,7 @@ int nr;
do_log(cmdline); /* jl 22.06.97 */
$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;
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);

57
comms/minicom/patches/patch-src_util_c Normal file
View File

@ -0,0 +1,57 @@
$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;
/* Drop all priviliges (irreversable). */
void drop_all_privs()
{
+#ifdef HAS_EUID
+ setegid(real_gid);
+ seteuid(real_uid);
+#else
#ifdef HAS_REUID
/* Regain privs needed to drop privs :) */
setregid(real_gid, eff_gid);
setreuid(real_uid, eff_uid);
#endif
+#endif
/* Drop it. */
setgid(real_gid);
@@ -189,22 +194,36 @@ void drop_all_privs()
/* Drop priviliges (swap uid's) */
void drop_privs()
{
+#ifdef HAS_EUID
+ setegid(real_gid);
+ if (seteuid(real_uid) < 0)
+ 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);
not_suid = 1;
#endif
+#endif
}
/* Set priviliges (swap uid's) */
void set_privs()
{
+#ifdef HAS_EUID
+ setegid(eff_gid);
+ if (seteuid(eff_uid) < 0)
+ fprintf(stderr, _("minicom: cannot seteuid(%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);
not_suid = 0;
+#endif
#endif
}

16
comms/minicom/patches/patch-windiv_c → comms/minicom/patches/patch-src_windiv_c
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-windiv_c,v 1.1 2001/10/12 02:49:03 brad Exp $
--- windiv.c.orig Thu Jul 30 12:48:23 1998
+++ windiv.c Thu Oct 11 22:16:07 2001
@@ -12,6 +12,7 @@
*
* hgk+jl 02.98 File selection window (no longer used this way..)
*/
$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
@@ -19,6 +19,7 @@
#include "rcsid.h"
RCSID("$Id: patch-src_windiv_c,v 1.1 2002/03/22 05:31:37 form Exp $")
+#include <sys/types.h>
#include <dirent.h>
#include <sys/stat.h>
#include "port.h"
@@ -244,8 +245,14 @@ char *file_dir;
@@ -251,8 +252,14 @@ char *file_dir;
/* get regular files */
dirlist[nCnt].d_ino = dirent->d_ino;

12
comms/minicom/patches/patch-src_window_c Normal file
View File

@ -0,0 +1,12 @@
$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;

31
comms/minicom/patches/patch-util_c
View File

@ -1,31 +0,0 @@
$OpenBSD: patch-util_c,v 1.1 2001/10/12 02:49:03 brad Exp $
--- util.c.orig Sat May 16 03:13:12 1998
+++ util.c Thu Oct 11 22:16:07 2001
@@ -187,6 +187,13 @@ void drop_privs()
if (setreuid(eff_uid, real_uid) < 0)
fprintf(stderr, "minicom: cannot setreuid(%d, %d)\n", eff_uid, real_uid);
not_suid = 1;
+#else
+#ifdef HAS_EUID
+ if (setegid(real_gid) < 0)
+ fprintf(stderr, "minicom: cannot setegid(%d)\n", real_gid);
+ if (seteuid(real_uid) < 0)
+ fprintf(stderr, "minicom: cannot seteuid(%d)\n", real_uid);
+#endif
#endif
}
@@ -198,6 +205,13 @@ void set_privs()
if (setreuid(real_uid, eff_uid) < 0)
fprintf(stderr, "minicom: cannot setreuid(%d, %d)\n", real_uid, eff_uid);
not_suid = 0;
+#else
+#ifdef HAS_EUID
+ if (setegid(eff_gid) < 0)
+ fprintf(stderr, "minicom: cannot setegid(%d)\n", eff_gid);
+ if (seteuid(eff_uid) < 0)
+ fprintf(stderr, "minicom: cannot seteuid(%d)\n", eff_uid);
+#endif
#endif
}

12
comms/minicom/patches/patch-window_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-window_c,v 1.1 2001/10/12 02:49:03 brad Exp $
--- window.c.orig Thu Mar 16 04:44:25 2000
+++ window.c Thu Oct 11 22:16:07 2001
@@ -104,7 +104,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;

13
comms/minicom/pkg/INSTALL
View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: INSTALL,v 1.3 2000/08/31 00:40:31 brad Exp $
# $OpenBSD: INSTALL,v 1.4 2002/03/22 05:31:37 form Exp $
#
# Pre/post-installation setup of minicom
@ -9,7 +9,7 @@ set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_DIR=/etc/minicom
SAMPLE_CONFIG_DIR=$PREFIX/share/examples/minicom
SAMPLE_CONFIG_DIR=${PREFIX}/share/examples/minicom
do_notice()
{
@ -17,7 +17,7 @@ do_notice()
echo "+---------------"
echo "| The existing $1 configuration files in $CONFIG_DIR,"
echo "| have NOT been changed. You may want to compare them to the"
echo "| current sample files in $SAMPLE_CONFIG_DIR,"
echo "| current sample files in ${SAMPLE_CONFIG_DIR},"
echo "| and update your configuration as needed."
echo "+---------------"
echo
@ -25,12 +25,13 @@ do_notice()
do_install()
{
install -d -o root -g wheel -m 755 $CONFIG_DIR
install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/* $CONFIG_DIR
install -d -o uucp -g dialer -m 750 ${CONFIG_DIR}
install -o root -g wheel -m 644 ${SAMPLE_CONFIG_DIR}/minicom.users.sample \
${CONFIG_DIR}/minicom.users
echo
echo "+---------------"
echo "| The $1 configuration files have been installed into"
echo "| $CONFIG_DIR. Please view these files and change"
echo "| ${CONFIG_DIR}. Please view these files and change"
echo "| the configuration to meet your needs."
echo "+---------------"
echo

54
comms/minicom/pkg/PLIST
View File

@ -1,22 +1,28 @@
@comment $OpenBSD: PLIST,v 1.10 2000/08/31 00:40:31 brad Exp $
@comment $OpenBSD: PLIST,v 1.11 2002/03/22 05:31:37 form Exp $
bin/ascii-xfr
@owner uucp
@group dialer
@mode 6111
bin/minicom
@owner
@group
@mode
bin/runscript
bin/xminicom
man/man1/ascii-xfr.1
man/man1/minicom.1
man/man1/runscript.1
share/doc/minicom/AUTHORS
share/doc/minicom/Announce-1.78
share/doc/minicom/Announce-1.82
share/doc/minicom/Announce-1.82.1
share/doc/minicom/Announce-1.83
share/doc/minicom/Announce-1.83.1
share/doc/minicom/COMPATABILITY.lrzsz
share/doc/minicom/COPYING
share/doc/minicom/ChangeLog
share/doc/minicom/ChangeLog.old
share/doc/minicom/HistSearch
share/doc/minicom/Locales
share/doc/minicom/Macros
share/doc/minicom/Porting
share/doc/minicom/QuickStart.modemu
share/doc/minicom/README.lrzsz
share/doc/minicom/RedHat
@ -27,11 +33,6 @@ share/doc/minicom/Todo.Irix.dif
share/doc/minicom/Todo.emacskey.dif
share/doc/minicom/Todo.fsel
share/doc/minicom/copyright.modemu
share/doc/minicom/demos/htsalogin
share/doc/minicom/demos/saralogin
share/doc/minicom/demos/scriptdemo
share/doc/minicom/demos/unixlogin
share/doc/minicom/developers
share/doc/minicom/fselector.txt
share/doc/minicom/japanese
share/doc/minicom/minicom.FAQ
@ -41,19 +42,36 @@ share/doc/minicom/modemu.README
share/doc/minicom/pl-translation.txt
share/doc/minicom/portugues-brasil
share/doc/minicom/suomeksi
share/doc/minicom/tables/mc.iso
share/doc/minicom/tables/mc.noconv
share/doc/minicom/tables/mc.pc8
share/doc/minicom/tables/mc.sf7
share/examples/minicom/minicom.users
share/examples/minicom/extras/htsalogin
share/examples/minicom/extras/linux/INSTALL
share/examples/minicom/extras/linux/README-FIRST
share/examples/minicom/extras/linux/mtelnet
share/examples/minicom/extras/saralogin
share/examples/minicom/extras/scriptdemo
share/examples/minicom/extras/tables/mc.iso
share/examples/minicom/extras/tables/mc.noconv
share/examples/minicom/extras/tables/mc.pc8
share/examples/minicom/extras/tables/mc.sf7
share/examples/minicom/extras/termcap/README
share/examples/minicom/extras/termcap/termcap.long
share/examples/minicom/extras/termcap/termcap.short
share/examples/minicom/extras/terminfo/README
share/examples/minicom/extras/terminfo/minicom
share/examples/minicom/extras/unixlogin
share/examples/minicom/minicom.users.sample
share/locale/cs_CZ/LC_MESSAGES/minicom.mo
share/locale/es/LC_MESSAGES/minicom.mo
share/locale/fi_FI/LC_MESSAGES/minicom.mo
share/locale/fr/LC_MESSAGES/minicom.mo
share/locale/ja/LC_MESSAGES/minicom.mo
share/locale/ja_JP.SJIS/LC_MESSAGES/minicom.mo
share/locale/ko/LC_MESSAGES/minicom.mo
share/locale/pl/LC_MESSAGES/minicom.mo
share/locale/pt_BR/LC_MESSAGES/minicom.mo
@dirrm share/doc/minicom/tables
@dirrm share/doc/minicom/demos
@dirrm share/doc/minicom
share/locale/ru/LC_MESSAGES/minicom.mo
@dirrm share/examples/minicom/extras/terminfo
@dirrm share/examples/minicom/extras/termcap
@dirrm share/examples/minicom/extras/tables
@dirrm share/examples/minicom/extras/linux
@dirrm share/examples/minicom/extras
@dirrm share/examples/minicom
@dirrm share/doc/minicom