Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Jun 2019 13:37:52 +0000 (UTC)
From:      Michael Landin <mich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r504422 - in head/comms/tits: . files
Message-ID:  <201906171337.x5HDbqXx090055@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mich
Date: Mon Jun 17 13:37:52 2019
New Revision: 504422
URL: https://svnweb.freebsd.org/changeset/ports/504422

Log:
  - update to -> 1.3.0
  - cleanup Makefile to keep portlint happy
  - regenerate patches to keep portlint happy
  
  PR:		238610
  Submitted by:	Thomas Merkel <tm@NetBSD.org>

Added:
  head/comms/tits/files/patch-rtelnet.c   (contents, props changed)
Deleted:
  head/comms/tits/files/patch-tty.c
Modified:
  head/comms/tits/Makefile
  head/comms/tits/distinfo
  head/comms/tits/files/patch-Makefile
  head/comms/tits/files/patch-dispatcher.c
  head/comms/tits/files/patch-listener.c

Modified: head/comms/tits/Makefile
==============================================================================
--- head/comms/tits/Makefile	Mon Jun 17 13:35:17 2019	(r504421)
+++ head/comms/tits/Makefile	Mon Jun 17 13:37:52 2019	(r504422)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tits
-PORTVERSION=	1.1.2
-PORTREVISION=	2
+PORTVERSION=	1.3.0
 CATEGORIES=	comms
 MASTER_SITES=	http://www.mctavish.co.uk/tits/
 
@@ -14,6 +13,7 @@ LICENSE=	BSD4CLAUSE
 
 USES=		uidfix
 USE_RC_SUBR=	tits
+
 MAKE_ENV=	BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man
 
 post-patch:

Modified: head/comms/tits/distinfo
==============================================================================
--- head/comms/tits/distinfo	Mon Jun 17 13:35:17 2019	(r504421)
+++ head/comms/tits/distinfo	Mon Jun 17 13:37:52 2019	(r504422)
@@ -1,2 +1,3 @@
-SHA256 (tits-1.1.2.tar.gz) = da82e0ca603dbcb59c4d28353a47a70d228e6b2cd6df23f952abe367850970e0
-SIZE (tits-1.1.2.tar.gz) = 21948
+TIMESTAMP = 1560688435
+SHA256 (tits-1.3.0.tar.gz) = f6cd7bf11b8aa730be0ddd6ed6f6a3a8380285959a586e9404d5ec02ef73f237
+SIZE (tits-1.3.0.tar.gz) = 31811

Modified: head/comms/tits/files/patch-Makefile
==============================================================================
--- head/comms/tits/files/patch-Makefile	Mon Jun 17 13:35:17 2019	(r504421)
+++ head/comms/tits/files/patch-Makefile	Mon Jun 17 13:37:52 2019	(r504422)
@@ -1,6 +1,6 @@
---- Makefile.orig	Wed Sep 24 16:05:07 2003
-+++ Makefile	Wed Sep 24 16:06:52 2003
-@@ -29,15 +29,15 @@
+--- Makefile.orig	2011-01-15 12:47:19 UTC
++++ Makefile
+@@ -29,22 +29,22 @@
  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
@@ -11,11 +11,20 @@
 -MAN=	tits.8
 +MAN8=	tits.8
  
- SRCS=	main.c buffer.c client.c context.c listener.c telnet.c tty.c
- SRCS+=	dispatcher.c setup.c config.c server.c logger.c
+ 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
+ SRCS+=	rtelnet.c
  
+ .if !defined(SMALLPROG)
 -CPPFLAGS+= -DLIBWRAP -DTITS_DEFAULT_CONFIG_FILE=\"${LOCALBASE}/etc/tits.conf\"
 +CFLAGS+= -DLIBWRAP -DTITS_DEFAULT_CONFIG_FILE=\"${LOCALBASE}/etc/tits.conf\"
  LDADD+=	-lwrap
+ .else
+-CPPFLAGS+= -DTITS_DEFAULT_CONFIG_FILE=\"/etc/tits.conf\"
++CFLAGS+= -DTITS_DEFAULT_CONFIG_FILE=\"${LOCALBASE}/etc/tits.conf\"
+ .endif
+-CPPFLAGS+= -DTITS_DEFAULT_LINKDIR=\"/var/run\"
++CFLAGS+= -DTITS_DEFAULT_LINKDIR=\"/var/run\"
  PREFIX?= /usr/local
  BINDIR?= ${PREFIX}/sbin
+ 

Modified: head/comms/tits/files/patch-dispatcher.c
==============================================================================
--- head/comms/tits/files/patch-dispatcher.c	Mon Jun 17 13:35:17 2019	(r504421)
+++ head/comms/tits/files/patch-dispatcher.c	Mon Jun 17 13:37:52 2019	(r504422)
@@ -1,11 +1,11 @@
---- dispatcher.c.orig	Tue Sep 24 13:21:42 2002
-+++ dispatcher.c	Tue Sep 24 13:23:15 2002
-@@ -131,7 +131,7 @@
+--- dispatcher.c.orig	2006-03-19 11:34:47 UTC
++++ dispatcher.c
+@@ -237,7 +237,7 @@ dispatcher_mainloop(void)
  	struct context *ctx;
  	struct client_ctx *cc;
  	struct pollfd *pf;
 -	nfds_t pfds;
 +	unsigned int pfds;
  	int nfds, errcnt = 0;
- 
- 	while (!TAILQ_EMPTY(&contexts)) {
+ 	int timeout;
+ 	time_t delta = 0;

Modified: head/comms/tits/files/patch-listener.c
==============================================================================
--- head/comms/tits/files/patch-listener.c	Mon Jun 17 13:35:17 2019	(r504421)
+++ head/comms/tits/files/patch-listener.c	Mon Jun 17 13:37:52 2019	(r504422)
@@ -1,12 +1,13 @@
---- listener.c.orig
+--- listener.c.orig	2009-11-16 14:30:13 UTC
 +++ listener.c
-@@ -189,10 +189,6 @@
+@@ -189,11 +189,6 @@ listener_destroy(struct client_ctx *cc)
  	    NULL)
  		context_del_client(cc->cc_ctx, ccc);
  
 -	if (lc->lc_args.la_address)
 -		(void) free(lc->lc_args.la_address);
--	(void) free(lc->lc_args.la_port);
+-	if (lc->lc_args.la_port)
+-		(void) free(lc->lc_args.la_port);
 -
  	(void) free(lc);
  }

Added: head/comms/tits/files/patch-rtelnet.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/tits/files/patch-rtelnet.c	Mon Jun 17 13:37:52 2019	(r504422)
@@ -0,0 +1,11 @@
+--- rtelnet.c.orig	2019-06-17 13:22:22 UTC
++++ rtelnet.c
+@@ -900,7 +900,7 @@ cf_rtelnet_port(void *cs, char **argv, i
+ 
+ 	if (isdigit((unsigned char)argv[1][0])) {
+ 		ro->ro_port = atoi(argv[1]);
+-		if (ro->ro_port < 0 || ro->ro_port > IPPORT_ANONMAX)
++		if (ro->ro_port < 0 || ro->ro_port > IPPORT_MAX)
+ 			return (config_err(cs, "Invalid port number '%s'",
+ 			    argv[1]));
+ 	} else



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906171337.x5HDbqXx090055>