Update port to rtty-4.0.shar.gz with patches fed back to Vixie.

Make default group dialer, not wheel, to match default OpenBSD
device permissions.
This commit is contained in:
millert 2002-05-08 18:42:10 +00:00
parent 0e63ff5347
commit 28ef82dd9f
10 changed files with 140 additions and 45 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.13 2002/03/21 21:25:52 espie Exp $
# $OpenBSD: Makefile,v 1.14 2002/05/08 18:42:10 millert Exp $
#
COMMENT= "multiuser "tip"/"cu" replacement with logging"
DISTNAME= rtty-3.2
DISTNAME= rtty-4.0
CATEGORIES= sysutils
NEED_VERSION= 1.515
@ -14,6 +14,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ftp://ftp.vix.com/pub/vixie/
EXTRACT_SUFX= .shar.gz
WRKDIST= ${WRKDIR}

View File

@ -1,3 +1,3 @@
MD5 (rtty-3.2.tar.gz) = cb16df2f8eed6f1d97cd9ef125e056e3
RMD160 (rtty-3.2.tar.gz) = 03863b5fbaf27a6f254c620e91c3dcd364df926a
SHA1 (rtty-3.2.tar.gz) = 62587ee4eec0b551b2b38341f20fddebde1ee8a1
MD5 (rtty-4.0.shar.gz) = 1b9eba3dbb0fb5a11c15275977f2d7ac
RMD160 (rtty-4.0.shar.gz) = 47d8a7e63217056bbf0d39cd131da726649cfe26
SHA1 (rtty-4.0.shar.gz) = 6697f06fb625269dd374e1218690e1655ef2c759

View File

@ -1,25 +1,26 @@
$OpenBSD: patch-Makefile,v 1.2 2001/03/12 15:07:25 wilfried Exp $
--- Makefile.orig Sat Aug 24 01:46:42 1996
+++ Makefile Mon Mar 12 16:07:14 2001
$OpenBSD: patch-Makefile,v 1.3 2002/05/08 18:42:10 millert Exp $
--- Makefile.orig Wed May 8 12:30:37 2002
+++ Makefile Wed May 8 12:30:37 2002
@@ -23,8 +23,6 @@ DESTROOT =
DESTPATH = $(DESTROOT)/usr/local/rtty
DESTBIN = $(DESTPATH)/bin
-CC = cc
-CDEBUG = -O -g
-#CC = cc
-CDEBUG = -O
#
# use -U to undefine, -D to define
# DEBUG include code to help debug this software
@@ -38,7 +36,7 @@ CDEBUG = -O -g
CDEFS = -DDEBUG -UWANT_TCPIP -UNEED_BITYPES_H -UNEED_STRDUP -UNEED_INET_ATON \
@@ -37,8 +35,7 @@ CDEBUG = -O
CDEFS = -DDEBUG -UWANT_TCPIP -UNEED_BITYPES_H -UNEED_INET_ATON \
-UNO_SOCKADDR_LEN -UNO_HSTRERROR
#
-CFLAGS = $(CDEBUG) $(CDEFS) -I/usr/local/include
-LIBS = -lcrypt
+CFLAGS += $(CDEFS)
LIBS =
#(if WANT_TCPIP defined and this isn't in your libc)
# -lresolv
@@ -63,7 +61,7 @@ install: $(ALL) Makefile
#(if the resolver needs it, which BIND>=4.9's will on BSD>=4.4 systems)
@@ -64,7 +61,7 @@ install: $(ALL) Makefile
test -d $(DESTPATH)/$$x || mkdir $(DESTPATH)/$$x; \
done
set -x; for x in $(BINARY); do \

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-console_sh,v 1.1 2002/05/08 18:42:10 millert Exp $
--- console.sh.orig Wed May 8 12:30:37 2002
+++ console.sh Wed May 8 12:30:37 2002
@@ -24,7 +24,7 @@ while [ $# -gt 0 ]; do
case $1 in
-r) cmdopts="$opts -r"; shift ;;
-*) shift ;;
- *) break 2 ;;
+ *) break ;;
esac
done

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-locbrok_c,v 1.1 2002/05/08 18:42:10 millert Exp $
--- locbrok.c.orig Wed May 8 12:30:37 2002
+++ locbrok.c Wed May 8 12:30:37 2002
@@ -76,10 +76,10 @@ static reg_db *RegDB = NULL;
main(int argc, char *argv[]) {
struct servent *serv;
- char ch;
+ int ch;
ProgName = argv[0];
- while ((ch = getopt(argc, argv, "s:x:")) != EOF) {
+ while ((ch = getopt(argc, argv, "s:x:")) != -1) {
switch (ch) {
case 's':
Service = optarg;

View File

@ -1,21 +1,21 @@
$OpenBSD: patch-rtty_c,v 1.1 2002/02/20 21:17:52 naddy Exp $
--- rtty.c.orig Wed Feb 20 22:06:40 2002
+++ rtty.c Wed Feb 20 22:07:18 2002
@@ -101,7 +101,7 @@ main(argc, argv)
int argc;
char *argv[];
{
$OpenBSD: patch-rtty_c,v 1.2 2002/05/08 18:42:10 millert Exp $
--- rtty.c.orig Wed May 8 12:30:37 2002
+++ rtty.c Wed May 8 12:30:37 2002
@@ -89,7 +89,7 @@ int Debug = 0;
int
main(int argc, char *argv[]) {
- char ch;
+ int ch;
ProgName = argv[0];
@@ -118,7 +118,7 @@ main(argc, argv)
@@ -106,7 +106,7 @@ main(int argc, char *argv[]) {
TtyName = "/dev/null";
}
- while ((ch = getopt(argc, argv, "s:x:l:7")) != EOF) {
+ while ((ch = getopt(argc, argv, "s:x:l:7")) != -1) {
- while ((ch = getopt(argc, argv, "s:x:l:7r")) != EOF) {
+ while ((ch = getopt(argc, argv, "s:x:l:7r")) != -1) {
switch (ch) {
case 's':
ServSpec = optarg;

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-startsrv_sh,v 1.1 2002/05/08 18:42:10 millert Exp $
--- startsrv.sh.orig Wed May 8 12:30:37 2002
+++ startsrv.sh Wed May 8 12:30:37 2002
@@ -19,7 +19,7 @@
default_options='-b 9600 -w 8 -p none'
default_sock_prot='ug=rw,o='
-default_sock_owner='root.wheel'
+default_sock_owner='root:dialer'
default_log_prot='u=rw,g=r,o='
for host

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-ttysrv_c,v 1.1 2002/02/20 21:17:52 naddy Exp $
--- ttysrv.c.orig Wed Feb 20 22:06:46 2002
+++ ttysrv.c Wed Feb 20 22:07:43 2002
@@ -143,13 +143,13 @@ main(argc, argv)
int argc;
char *argv[];
{
$OpenBSD: patch-ttysrv_c,v 1.2 2002/05/08 18:42:10 millert Exp $
--- ttysrv.c.orig Wed May 8 12:30:37 2002
+++ ttysrv.c Wed May 8 12:30:37 2002
@@ -136,13 +136,13 @@ static int set_baud(int),
int
main(int argc, char *argv[]) {
- int i;
- char ch, *msg;
+ int ch, i;

47
sysutils/rtty/pkg/INSTALL Normal file
View File

@ -0,0 +1,47 @@
#!/bin/sh
# $OpenBSD: INSTALL,v 1.1 2002/05/08 18:42:10 millert Exp $
#
# Pre/post-installation setup of rtty
# exit on errors, use a sane path and install prefix
#
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
# Function: tell the user what s/he needs to do to use the port just installed
#
do_notice()
{
echo
echo "+---------------"
echo "| Please see $PREFIX/rtty for setup instructions."
echo "| You will probably want to run $PREFIX/rtty/bin/Startup"
echo "| from /etc/rc.local."
echo "+---------------"
echo
}
# verify proper execution
#
if [ $# -ne 2 ]; then
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
fi
# Verify/process the command
#
case $2 in
PRE-INSTALL)
: nothing to pre-install for this port
;;
POST-INSTALL)
do_notice
;;
*)
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
;;
esac
exit 0

View File

@ -1,17 +1,23 @@
@comment $OpenBSD: PLIST,v 1.3 2002/04/07 01:54:53 naddy Exp $
rtty/bin/ttysrv
rtty/bin/rtty
rtty/bin/locbrok
rtty/bin/Startup
rtty/bin/console
rtty/bin/startsrv
rtty/bin/agelogs
rtty/bin/agelog
@comment $OpenBSD: PLIST,v 1.4 2002/05/08 18:42:10 millert Exp $
rtty/README
@dirrm rtty/dev
@dirrm rtty/sock
@dirrm rtty/log
@dirrm rtty/pid
@dirrm rtty/opt
rtty/bin
rtty/bin/Startup
rtty/bin/agelog
rtty/bin/agelogs
rtty/bin/console
rtty/bin/locbrok
rtty/bin/rtty
rtty/bin/startsrv
rtty/bin/ttysrv
rtty/dev
rtty/log
rtty/opt
rtty/pid
rtty/sock
@dirrm rtty/bin
@dirrm rtty/dev
@dirrm rtty/log
@dirrm rtty/opt
@dirrm rtty/pid
@dirrm rtty/sock
@dirrm rtty