From owner-svn-ports-all@freebsd.org Fri Oct 2 14:36:04 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 952E842EC56; Fri, 2 Oct 2020 14:36:04 +0000 (UTC) (envelope-from se@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4C2sxJ3QT8z4H45; Fri, 2 Oct 2020 14:36:04 +0000 (UTC) (envelope-from se@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 5868623735; Fri, 2 Oct 2020 14:36:04 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 092Ea4hY082340; Fri, 2 Oct 2020 14:36:04 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 092Ea3Pb082337; Fri, 2 Oct 2020 14:36:03 GMT (envelope-from se@FreeBSD.org) Message-Id: <202010021436.092Ea3Pb082337@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org using -f From: =?UTF-8?Q?Stefan_E=c3=9fer?= Date: Fri, 2 Oct 2020 14:36:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r551216 - in head/shells/ibsh: . files X-SVN-Group: ports-head X-SVN-Commit-Author: se X-SVN-Commit-Paths: in head/shells/ibsh: . files X-SVN-Commit-Revision: 551216 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Oct 2020 14:36:04 -0000 Author: se Date: Fri Oct 2 14:36:03 2020 New Revision: 551216 URL: https://svnweb.freebsd.org/changeset/ports/551216 Log: Fix build with -fno-common Added: head/shells/ibsh/files/patch-ibsh.h (contents, props changed) head/shells/ibsh/files/patch-main.c (contents, props changed) Modified: head/shells/ibsh/Makefile Modified: head/shells/ibsh/Makefile ============================================================================== --- head/shells/ibsh/Makefile Fri Oct 2 14:27:11 2020 (r551215) +++ head/shells/ibsh/Makefile Fri Oct 2 14:36:03 2020 (r551216) @@ -3,6 +3,7 @@ PORTNAME= ibsh PORTVERSION= 0.3e +PORTREVISION= 1 CATEGORIES= shells MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -13,9 +14,9 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING USES= dos2unix gmake +MAKE_ARGS= CC="${CC}" PREFIX="${STAGEDIR}${PREFIX}" ALL_TARGET= ibsh INSTALL_TARGET= ibsh_install -MAKE_ARGS= CC="${CC}" PREFIX="${STAGEDIR}${PREFIX}" SUB_FILES= pkg-message PORTDOCS= AUTHORS BUGS CONTRIBUTORS COPYING COPYRIGHT ChangeLog \ Added: head/shells/ibsh/files/patch-ibsh.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/shells/ibsh/files/patch-ibsh.h Fri Oct 2 14:36:03 2020 (r551216) @@ -0,0 +1,28 @@ +--- ibsh.h.orig 2020-10-02 14:29:21 UTC ++++ ibsh.h +@@ -88,17 +88,15 @@ typedef struct theuser { + + typedef char Strng[STRING_SIZE]; + +-theuser loggedin; /* user info */ ++extern theuser loggedin; /* user info */ + +-//static Strng commands[MAX_ITEMS]; /* permitted commands */ +-Strng commands[MAX_ITEMS]; +-Strng extensions[MAX_ITEMS]; +-/*static Strng extensions[MAX_ITEMS]; permitted extensions */ +-char real_path[STRING_SIZE]; /* absolute path */ +-char jail_path[STRING_SIZE]; /* path inside the jail */ +-char user_command[STRING_SIZE]; /* whatever the user types */ +-char filtered_command[STRING_SIZE]; /* this one will be executed */ +-int exitcode; ++extern Strng commands[MAX_ITEMS]; /* permitted commands */ ++extern Strng extensions[MAX_ITEMS]; /* permitted extensions */ ++extern char real_path[STRING_SIZE]; /* absolute path */ ++extern char jail_path[STRING_SIZE]; /* path inside the jail */ ++extern char user_command[STRING_SIZE]; /* whatever the user types */ ++extern char filtered_command[STRING_SIZE]; /* this one will be executed */ ++extern int exitcode; + extern char **environ; + + Added: head/shells/ibsh/files/patch-main.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/shells/ibsh/files/patch-main.c Fri Oct 2 14:36:03 2020 (r551216) @@ -0,0 +1,20 @@ +--- main.c.orig 2020-10-02 14:29:21 UTC ++++ main.c +@@ -38,6 +38,17 @@ + /* Header files */ + #include "ibsh.h" + ++theuser loggedin; /* user info */ ++ ++Strng commands[MAX_ITEMS]; /* permitted commands */ ++Strng extensions[MAX_ITEMS]; /* permitted extensions */ ++char real_path[STRING_SIZE]; /* absolute path */ ++char jail_path[STRING_SIZE]; /* path inside the jail */ ++char user_command[STRING_SIZE]; /* whatever the user types */ ++char filtered_command[STRING_SIZE]; /* this one will be executed */ ++int exitcode; ++ ++ + /* Main: */ + /* Handle arguments, read config files, start command processing. */ + /* IBSH doesnt use any command line arguments, but my text editor */