Date: Fri, 2 Oct 2020 14:36:03 +0000 (UTC) From: =?UTF-8?Q?Stefan_E=c3=9fer?= <se@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r551216 - in head/shells/ibsh: . files Message-ID: <202010021436.092Ea3Pb082337@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010021436.092Ea3Pb082337>