From owner-svn-ports-head@freebsd.org Mon Feb 25 13:37:49 2019
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id BEB58150B127;
Mon, 25 Feb 2019 13:37:49 +0000 (UTC)
(envelope-from garga@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 5F50A8D6EE;
Mon, 25 Feb 2019 13:37:49 +0000 (UTC)
(envelope-from garga@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 439861DA6F;
Mon, 25 Feb 2019 13:37:49 +0000 (UTC)
(envelope-from garga@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1PDbn2d063213;
Mon, 25 Feb 2019 13:37:49 GMT (envelope-from garga@FreeBSD.org)
Received: (from garga@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1PDbmSM063211;
Mon, 25 Feb 2019 13:37:48 GMT (envelope-from garga@FreeBSD.org)
Message-Id: <201902251337.x1PDbmSM063211@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: garga set sender to
garga@FreeBSD.org using -f
From: Renato Botelho <garga@FreeBSD.org>
Date: Mon, 25 Feb 2019 13:37:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r493861 - in head/shells/scponly: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: garga
X-SVN-Commit-Paths: in head/shells/scponly: . files
X-SVN-Commit-Revision: 493861
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 5F50A8D6EE
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.97 / 15.00];
local_wl_from(0.00)[FreeBSD.org];
NEURAL_HAM_MEDIUM(-1.00)[-0.997,0];
NEURAL_HAM_SHORT(-0.97)[-0.973,0];
NEURAL_HAM_LONG(-1.00)[-1.000,0];
ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
<svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Feb 2019 13:37:50 -0000
Author: garga
Date: Mon Feb 25 13:37:48 2019
New Revision: 493861
URL: https://svnweb.freebsd.org/changeset/ports/493861
Log:
shells/scponly: fix segfault on FreeBSD 12 and newer
On FreeBSD 12+ basename(3) writes to its argument, which in scponly isn't a
writable string, so it segfaults. This patch works around it.
PR: 235810
Submitted by: fullermd@over-yonder.net
Added:
head/shells/scponly/files/patch-helper.c (contents, props changed)
Modified:
head/shells/scponly/Makefile
Modified: head/shells/scponly/Makefile
==============================================================================
--- head/shells/scponly/Makefile Mon Feb 25 13:28:39 2019 (r493860)
+++ head/shells/scponly/Makefile Mon Feb 25 13:37:48 2019 (r493861)
@@ -3,7 +3,7 @@
PORTNAME= scponly
PORTVERSION= 4.8.20110526
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= shells security
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-snapshots
DISTNAME= ${PORTNAME}-20110526
Added: head/shells/scponly/files/patch-helper.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/shells/scponly/files/patch-helper.c Mon Feb 25 13:37:48 2019 (r493861)
@@ -0,0 +1,26 @@
+--- helper.c.orig 2010-09-08 05:58:11 UTC
++++ helper.c
+@@ -323,16 +323,20 @@ int valid_arg_vector(char **av)
+ char *substitute_known_path(char *request)
+ {
+ cmd_t *cmd=commands;
+- char *stripped_req=strdup(basename(request));
++ char *stripped_req=strdup(request);
++ stripped_req=basename(stripped_req);
+ while (cmd != NULL)
+ {
++ char *nname;
+ if (cmd->name == NULL)
+ break;
+- if (exact_match(basename(cmd->name),stripped_req))
++ nname = strdup(cmd->name);
++ if (exact_match(basename(nname),stripped_req))
+ {
+ free(stripped_req); /* discard old pathname */
+- return (strdup(cmd->name));
++ return (nname);
+ }
++ free(nname);
+ cmd++;
+ }
+ return (stripped_req);