diff options
| -rw-r--r-- | sysutils/tits/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/tits/distinfo | 12 | ||||
| -rw-r--r-- | sysutils/tits/patches/patch-aa | 20 | ||||
| -rw-r--r-- | sysutils/tits/patches/patch-af | 17 | ||||
| -rw-r--r-- | sysutils/tits/patches/patch-ag | 36 |
5 files changed, 20 insertions, 70 deletions
diff --git a/sysutils/tits/Makefile b/sysutils/tits/Makefile index c5d2abd9bd8..8c91be9de78 100644 --- a/sysutils/tits/Makefile +++ b/sysutils/tits/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.26 2013/12/23 11:57:05 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2015/04/26 14:38:10 mef Exp $ -DISTNAME= tits-1.2.2 -PKGREVISION= 1 +DISTNAME= tits-1.3.0 CATEGORIES= sysutils MASTER_SITES= http://www.mctavish.co.uk/tits/ diff --git a/sysutils/tits/distinfo b/sysutils/tits/distinfo index f44b07a14d1..acb040df12c 100644 --- a/sysutils/tits/distinfo +++ b/sysutils/tits/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.10 2011/01/10 12:47:03 obache Exp $ +$NetBSD: distinfo,v 1.11 2015/04/26 14:38:10 mef Exp $ -SHA1 (tits-1.2.2.tar.gz) = 18c80cc4d814af1b60d8b75e9777bcb7f8b8a8b8 -RMD160 (tits-1.2.2.tar.gz) = 1628dcf16cd5cf9f559a353024c69aef6a396856 -Size (tits-1.2.2.tar.gz) = 25384 bytes -SHA1 (patch-aa) = 6b8915971eb67c2413c84d23e65bbd66a0a9d968 -SHA1 (patch-af) = f5c143a1231ed6615ee2bfb7ba24390e3d76ffe8 -SHA1 (patch-ag) = 7e5705207aa9c4fe8ecc765c393b7c67197033f7 +SHA1 (tits-1.3.0.tar.gz) = 66719b17ad2dd014f07b205e72a31e4510769cec +RMD160 (tits-1.3.0.tar.gz) = de693560ed8b6cd37b103cef0b189afdf07e43c9 +Size (tits-1.3.0.tar.gz) = 31811 bytes +SHA1 (patch-aa) = 0538413b25c6f9ca158b5f7d86ff0ec97500b506 diff --git a/sysutils/tits/patches/patch-aa b/sysutils/tits/patches/patch-aa index 2e213592edc..a3ae1c55d50 100644 --- a/sysutils/tits/patches/patch-aa +++ b/sysutils/tits/patches/patch-aa @@ -1,15 +1,21 @@ -$NetBSD: patch-aa,v 1.5 2011/01/10 12:17:43 obache Exp $ +$NetBSD: patch-aa,v 1.6 2015/04/26 14:38:10 mef Exp $ * for the case of ${PKG_SYSCONFDIR} != ${LOCALBASE}/etc ---- Makefile.orig 2006-03-19 11:32:58.000000000 +0000 -+++ Makefile 2006-09-19 14:10:20.000000000 +0100 -@@ -37,7 +37,7 @@ - SRCS= main.c buffer.c client.c context.c listener.c masterpty.c telnet.c - SRCS+= tty.c dispatcher.c setup.c config.c server.c logger.c stdio2pty.c +--- Makefile.orig 2011-01-15 21:47:19.000000000 +0900 ++++ Makefile 2015-04-26 23:15:46.000000000 +0900 +@@ -39,12 +39,12 @@ SRCS+= tty.c dispatcher.c setup.c config + SRCS+= rtelnet.c + .if !defined(SMALLPROG) -CPPFLAGS+= -DLIBWRAP -DTITS_DEFAULT_CONFIG_FILE=\"${LOCALBASE}/etc/tits.conf\" +CPPFLAGS+= -DLIBWRAP -DTITS_DEFAULT_CONFIG_FILE=\"${PKG_SYSCONFDIR}/tits.conf\" - CPPFLAGS+= -DTITS_DEFAULT_LINKDIR=\"/var/run\" LDADD+= -lwrap + .else + CPPFLAGS+= -DTITS_DEFAULT_CONFIG_FILE=\"/etc/tits.conf\" + .endif +-CPPFLAGS+= -DTITS_DEFAULT_LINKDIR=\"/var/run\" ++CPPFLAGS+= -DTITS_DEFAULT_LINKDIR=\"${VARBASE}/run\" PREFIX?= /usr/local + BINDIR?= ${PREFIX}/sbin + diff --git a/sysutils/tits/patches/patch-af b/sysutils/tits/patches/patch-af deleted file mode 100644 index bbdf25ab9d1..00000000000 --- a/sysutils/tits/patches/patch-af +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-af,v 1.1 2011/01/10 12:47:03 obache Exp $ - -* ignore WALLSIG if not exists. - ---- stdio2pty.c.orig 2004-09-12 19:20:28.000000000 +0000 -+++ stdio2pty.c -@@ -18,6 +18,10 @@ - - #define MAX_BUFF_LEN 32768 - -+#ifndef WALLSIG -+#define WALLSIG 0 -+#endif -+ - static int all_done, exit_status, child_pid; - - static struct buffer_ctx *stdout_buff; diff --git a/sysutils/tits/patches/patch-ag b/sysutils/tits/patches/patch-ag deleted file mode 100644 index d2bb612f854..00000000000 --- a/sysutils/tits/patches/patch-ag +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2011/01/10 12:47:03 obache Exp $ - -* only for TIOCGFLAGS avalilable. - ---- tty.c.orig 2006-03-19 11:32:48.000000000 +0000 -+++ tty.c -@@ -32,6 +32,7 @@ - #include <sys/types.h> - #include <sys/filio.h> - #include <sys/ioctl.h> -+#include <sys/stat.h> - - #include <assert.h> - #include <ctype.h> -@@ -318,7 +319,9 @@ tty_open_device(struct client_ctx *cc) - { - struct tty_ctx *tc = cc->cc_data; - struct termios tent; -+#ifdef TIOCGFLAGS - int flags; -+#endif - int fd, fd2; - - if (tc->tc_open) -@@ -369,7 +372,11 @@ tty_open_device(struct client_ctx *cc) - * If this is *not* a pseudo tty, ensure DTR is asserted. - * Note: This relies on TIOCGFLAGS returning ENOTTY for pty(4)'s. - */ -+#ifdef TIOCGFLAGS - if (ioctl(fd, TIOCGFLAGS, &flags) == 0 && errno == ENOTTY && -+#else -+ if ( -+#endif - ioctl(fd, TIOCSDTR, 0) < 0) { - syslog(LOG_ALERT, "tty_open_device(): assert DTR failed (%d)", - errno); |