Attachment 177439 Details for Bug 214876 – Patch to update sysutils/ttyd to 1.2.1

[patch] Patch to update sysutils/ttyd to 1.2.1

1.2.1.diff (text/plain), 3.91 KB, created by Neel Chauhan on 2016-11-27 12:26:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neel Chauhan

Created: 2016-11-27 12:26:38 UTC

Size: 3.91 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 427228)
>+++ Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	ttyd
>-PORTVERSION=	1.2.0
>+PORTVERSION=	1.2.1
> CATEGORIES=	sysutils
> 
> MAINTAINER=	neel@neelc.org
>Index: distinfo
>===================================================================
>--- distinfo	(revision 427228)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1479470581
>-SHA256 (tsl0922-ttyd-1.2.0_GH0.tar.gz) = 00f8399a1045057a55a5a5dd2540bfbf39df972ad0c1c2a9e3bc94574514c9bd
>-SIZE (tsl0922-ttyd-1.2.0_GH0.tar.gz) = 177550
>+TIMESTAMP = 1480249069
>+SHA256 (tsl0922-ttyd-1.2.1_GH0.tar.gz) = 6f4f5e30d92ea1694ce528bdebb892a92aac5dda1ce13ea3b1ce7b865b971f85
>+SIZE (tsl0922-ttyd-1.2.1_GH0.tar.gz) = 179612
>Index: files/patch-src-server.c
>===================================================================
>--- files/patch-src-server.c	(nonexistent)
>+++ files/patch-src-server.c	(working copy)
>@@ -0,0 +1,49 @@
>+--- src/server.c.orig	2016-11-27 07:15:40.710122000 -0500
>++++ src/server.c	2016-11-27 07:16:29.901863000 -0500
>+@@ -91,7 +91,8 @@
>+     int cmd_argc = argc - start;
>+     char **cmd_argv = &argv[start];
>+     ts->argv = t_malloc(sizeof(char *) * (cmd_argc + 1));
>+-    for (int i = 0; i < cmd_argc; i++) {
>++    int i;
>++    for (i = 0; i < cmd_argc; i++) {
>+         ts->argv[i] = strdup(cmd_argv[i]);
>+         cmd_len += strlen(ts->argv[i]);
>+         if (i != cmd_argc - 1) {
>+@@ -102,7 +103,7 @@
>+ 
>+     ts->command = t_malloc(cmd_len);
>+     char *ptr = ts->command;
>+-    for (int i = 0; i < cmd_argc; i++) {
>++    for (i = 0; i < cmd_argc; i++) {
>+         ptr = stpcpy(ptr, ts->argv[i]);
>+         if (i != cmd_argc - 1) {
>+             sprintf(ptr++, "%c", ' ');
>+@@ -130,7 +131,8 @@
>+     // make a copy of argc and argv
>+     int argc_copy = argc;
>+     char **argv_copy = t_malloc(sizeof(char *) * argc);
>+-    for (int i = 0; i < argc; i++) {
>++    int i;
>++    for (i = 0; i < argc; i++) {
>+         argv_copy[i] = strdup(argv[i]);
>+     }
>+ 
>+@@ -142,7 +144,7 @@
>+     int start = argc;
>+     if (optind < argc) {
>+         char *command = argv_copy[optind];
>+-        for (int i = 0; i < argc; i++) {
>++        for (i = 0; i < argc; i++) {
>+             if (strcmp(argv[i], command) == 0) {
>+                 start = i;
>+                 break;
>+@@ -151,7 +153,7 @@
>+     }
>+ 
>+     // free argv copy
>+-    for (int i = 0; i < argc; i++) {
>++    for (i = 0; i < argc; i++) {
>+         t_free(argv_copy[i]);
>+     }
>+     t_free(argv_copy);
>
>Property changes on: files/patch-src-server.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src-utils.c
>===================================================================
>--- files/patch-src-utils.c	(nonexistent)
>+++ files/patch-src-utils.c	(working copy)
>@@ -0,0 +1,19 @@
>+--- src/utils.c.orig	2016-11-27 07:15:19.334571000 -0500
>++++ src/utils.c	2016-11-27 07:24:17.362091000 -0500
>+@@ -67,7 +67,8 @@
>+     if (strcasestr(sig_name, "sig") != sig_name || strlen(sig_name) <= 3) {
>+         return -1;
>+     }
>+-    for (int sig = 1; sig < NSIG; sig++) {
>++    int sig;
>++    for (sig = 1; sig < NSIG; sig++) {
>+         const char *name = sys_signame[sig];
>+         if (strcasecmp(name, sig_name + 3) == 0)
>+             return sig;
>+@@ -100,4 +101,4 @@
>+     *dst = '\0';
>+ 
>+     return ret;
>+-}
>+\ No newline at end of file
>++}
>
>Property changes on: files/patch-src-utils.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 214876: 177439