View | Details | Raw Unified | Return to bug 238610
Collapse All | Expand All

(-)b/comms/tits/Makefile (-2 / +1 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	tits
4
PORTNAME=	tits
5
PORTVERSION=	1.1.2
5
PORTVERSION=	1.3.0
6
PORTREVISION=	2
7
CATEGORIES=	comms
6
CATEGORIES=	comms
8
MASTER_SITES=	http://www.mctavish.co.uk/tits/
7
MASTER_SITES=	http://www.mctavish.co.uk/tits/
9
8
(-)b/comms/tits/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (tits-1.1.2.tar.gz) = da82e0ca603dbcb59c4d28353a47a70d228e6b2cd6df23f952abe367850970e0
1
TIMESTAMP = 1560688435
2
SIZE (tits-1.1.2.tar.gz) = 21948
2
SHA256 (tits-1.3.0.tar.gz) = f6cd7bf11b8aa730be0ddd6ed6f6a3a8380285959a586e9404d5ec02ef73f237
3
SIZE (tits-1.3.0.tar.gz) = 31811
(-)b/comms/tits/files/patch-Makefile (-5 / +14 lines)
Lines 1-6 Link Here
1
--- Makefile.orig	Wed Sep 24 16:05:07 2003
1
--- Makefile.orig	2011-01-15 13:47:19.000000000 +0100
2
+++ Makefile	Wed Sep 24 16:06:52 2003
2
+++ Makefile	2019-06-16 14:35:41.993206000 +0200
3
@@ -29,15 +29,15 @@
3
@@ -29,22 +29,22 @@
4
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
4
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
5
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6
 
6
 
Lines 11-21 Link Here
11
-MAN=	tits.8
11
-MAN=	tits.8
12
+MAN8=	tits.8
12
+MAN8=	tits.8
13
 
13
 
14
 SRCS=	main.c buffer.c client.c context.c listener.c telnet.c tty.c
14
 SRCS=	main.c buffer.c client.c context.c listener.c masterpty.c telnet.c
15
 SRCS+=	dispatcher.c setup.c config.c server.c logger.c
15
 SRCS+=	tty.c dispatcher.c setup.c config.c server.c logger.c stdio2pty.c
16
 SRCS+=	rtelnet.c
16
 
17
 
18
 .if !defined(SMALLPROG)
17
-CPPFLAGS+= -DLIBWRAP -DTITS_DEFAULT_CONFIG_FILE=\"${LOCALBASE}/etc/tits.conf\"
19
-CPPFLAGS+= -DLIBWRAP -DTITS_DEFAULT_CONFIG_FILE=\"${LOCALBASE}/etc/tits.conf\"
18
+CFLAGS+= -DLIBWRAP -DTITS_DEFAULT_CONFIG_FILE=\"${LOCALBASE}/etc/tits.conf\"
20
+CFLAGS+= -DLIBWRAP -DTITS_DEFAULT_CONFIG_FILE=\"${LOCALBASE}/etc/tits.conf\"
19
 LDADD+=	-lwrap
21
 LDADD+=	-lwrap
22
 .else
23
-CPPFLAGS+= -DTITS_DEFAULT_CONFIG_FILE=\"/etc/tits.conf\"
24
+CFLAGS+= -DTITS_DEFAULT_CONFIG_FILE=\"${LOCALBASE}/etc/tits.conf\"
25
 .endif
26
-CPPFLAGS+= -DTITS_DEFAULT_LINKDIR=\"/var/run\"
27
+CFLAGS+= -DTITS_DEFAULT_LINKDIR=\"/var/run\"
20
 PREFIX?= /usr/local
28
 PREFIX?= /usr/local
21
 BINDIR?= ${PREFIX}/sbin
29
 BINDIR?= ${PREFIX}/sbin
30
 
(-)b/comms/tits/files/patch-listener.c (-4 / +5 lines)
Lines 1-12 Link Here
1
--- listener.c.orig
1
--- listener.c.orig	2019-06-16 14:38:29.081725000 +0200
2
+++ listener.c
2
+++ listener.c	2019-06-16 14:38:31.587036000 +0200
3
@@ -189,10 +189,6 @@
3
@@ -189,11 +189,6 @@
4
 	    NULL)
4
 	    NULL)
5
 		context_del_client(cc->cc_ctx, ccc);
5
 		context_del_client(cc->cc_ctx, ccc);
6
 
6
 
7
-	if (lc->lc_args.la_address)
7
-	if (lc->lc_args.la_address)
8
-		(void) free(lc->lc_args.la_address);
8
-		(void) free(lc->lc_args.la_address);
9
-	(void) free(lc->lc_args.la_port);
9
-	if (lc->lc_args.la_port)
10
-		(void) free(lc->lc_args.la_port);
10
-
11
-
11
 	(void) free(lc);
12
 	(void) free(lc);
12
 }
13
 }
(-)b/comms/tits/files/patch-tty.c (-15 / +5 lines)
Lines 1-20 Link Here
1
--- tty.c	2001/04/18 14:43:52	1.1
1
--- tty.c.orig	2011-01-15 13:48:44.000000000 +0100
2
+++ tty.c	2001/04/18 14:45:57
2
+++ tty.c	2019-06-16 14:41:22.199765000 +0200
3
@@ -32,6 +32,7 @@
3
@@ -33,6 +33,7 @@
4
 #include <sys/types.h>
5
 #include <sys/filio.h>
4
 #include <sys/filio.h>
6
 #include <sys/ioctl.h>
5
 #include <sys/ioctl.h>
6
 #include <sys/stat.h>
7
+#include <sys/stat.h>
7
+#include <sys/stat.h>
8
 #include <sys/types.h>
9
 
8
 
9
 #include <assert.h>
10
 #include <ctype.h>
10
 #include <ctype.h>
11
@@ -216,8 +217,7 @@
12
 	 * If this is *not* a pseudo tty, ensure DTR is asserted.
13
 	 * Note: This relies on TIOCGFLAGS returning ENOTTY for pty(4)'s.
14
 	 */
15
-	if (ioctl(cc->cc_fd, TIOCGFLAGS, &flags) == 0 && errno == ENOTTY &&
16
-	    ioctl(cc->cc_fd, TIOCSDTR, 0) < 0) {
17
+	if (ioctl(cc->cc_fd, TIOCSDTR, 0) < 0 && errno != ENOTTY) {
18
 		(void) close(cc->cc_fd);
19
 		(void) free(tc->tc_to.to_device);
20
 		(void) free(tc);

Return to bug 238610