From a535609f5b6f4f6357219630f2da485d4aefb9d9 Mon Sep 17 00:00:00 2001 From: netblue30 Date: Sat, 11 Aug 2018 08:53:05 -0400 Subject: release 0.9.56~rc1 testing --- RELNOTES | 4 +- configure | 18 +++--- configure.ac | 2 +- src/floader/README.md | 7 --- src/floader/loader.c | 161 ------------------------------------------------ src/floader/makefile | 5 -- test/blacklist-link.exp | 82 ------------------------ test/blacklist.exp | 75 ---------------------- test/blacklist1.profile | 1 - test/blacklist2.profile | 1 - test/blacklist3.profile | 1 - 11 files changed, 12 insertions(+), 345 deletions(-) delete mode 100644 src/floader/README.md delete mode 100644 src/floader/loader.c delete mode 100644 src/floader/makefile delete mode 100755 test/blacklist-link.exp delete mode 100755 test/blacklist.exp delete mode 100644 test/blacklist1.profile delete mode 100644 test/blacklist2.profile delete mode 100644 test/blacklist3.profile diff --git a/RELNOTES b/RELNOTES index 70abe7ac7..7dceccc0c 100644 --- a/RELNOTES +++ b/RELNOTES @@ -1,4 +1,4 @@ -firejail (0.9.55) baseline; urgency=low +firejail (0.9.56~rc1) baseline; urgency=low * work in progress * modif: removed CFG_CHROOT_DESKTOP configuration option * modif: removed compile time --enable-network=restricted @@ -16,7 +16,7 @@ firejail (0.9.55) baseline; urgency=low * new profiles: ms-skype, ms-word, riot-desktop, gnome-mpv, snox, gradio, * new profiles: standardnotes-desktop, shellcheck, patch, flameshot, * new profiles: rview, rvim, vimcat, vimdiff, vimpager, vimtutor, xxd - -- netblue30 Fri, 25 May 2018 08:00:00 -0500 + -- netblue30 Sat, 11 Aug 2018 08:00:00 -0500 firejail (0.9.54) baseline; urgency=low * modif: --force removed diff --git a/configure b/configure index 7c573f382..6e6f84256 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for firejail 0.9.55. +# Generated by GNU Autoconf 2.69 for firejail 0.9.56~rc1. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='firejail' PACKAGE_TARNAME='firejail' -PACKAGE_VERSION='0.9.55' -PACKAGE_STRING='firejail 0.9.55' +PACKAGE_VERSION='0.9.56~rc1' +PACKAGE_STRING='firejail 0.9.56~rc1' PACKAGE_BUGREPORT='netblue30@yahoo.com' PACKAGE_URL='https://firejail.wordpress.com' @@ -1277,7 +1277,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures firejail 0.9.55 to adapt to many kinds of systems. +\`configure' configures firejail 0.9.56~rc1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1339,7 +1339,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of firejail 0.9.55:";; + short | recursive ) echo "Configuration of firejail 0.9.56~rc1:";; esac cat <<\_ACEOF @@ -1445,7 +1445,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -firejail configure 0.9.55 +firejail configure 0.9.56~rc1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1747,7 +1747,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by firejail $as_me 0.9.55, which was +It was created by firejail $as_me 0.9.56~rc1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4395,7 +4395,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by firejail $as_me 0.9.55, which was +This file was extended by firejail $as_me 0.9.56~rc1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4449,7 +4449,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -firejail config.status 0.9.55 +firejail config.status 0.9.56~rc1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 1b1b48ce2..8c6459335 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.68]) -AC_INIT(firejail, 0.9.55, netblue30@yahoo.com, , https://firejail.wordpress.com) +AC_INIT(firejail, 0.9.56~rc1, netblue30@yahoo.com, , https://firejail.wordpress.com) AC_CONFIG_SRCDIR([src/firejail/main.c]) #AC_CONFIG_HEADERS([config.h]) diff --git a/src/floader/README.md b/src/floader/README.md deleted file mode 100644 index c1e14b2a6..000000000 --- a/src/floader/README.md +++ /dev/null @@ -1,7 +0,0 @@ -READ ME -------- - -* Run 'make' -* Add comma separated process names to ~/.loader.conf -* export LD_PRELOAD=./loader.so (ideally to .bashrc) -* Run any application within shell diff --git a/src/floader/loader.c b/src/floader/loader.c deleted file mode 100644 index b9844fa9b..000000000 --- a/src/floader/loader.c +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Copyright (C) 2017-2018 Madura A. (madura.x86@gmail.com) - * - */ -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#define MAX_MATCHES 32 -#define MAX_ARGS 1024 -#define MAX_ARGS_LEN 4096 -static void loader_main() __attribute__((constructor)); - -char cmdline[MAX_ARGS_LEN]; -char *args[MAX_ARGS]; -char loader[] = "firejail"; -char confFile[256]; -char *names[MAX_MATCHES]; - -#ifdef DEBUG -#define DBG printf -#else -#define DBG -#endif -void remove_trailing_spaces(char *str) -{ - while (!isspace(*str)) - { - str++; - } - - while (*str != '\0') - { - *str = '\0'; - str++; - } -} - -void read_cmdline() -{ - int fd = open("/proc/self/cmdline", O_RDONLY); - ssize_t ret = 0, total = 0; - char* wcmdbuf = cmdline; - while ((ret = read(fd, wcmdbuf, 1)) != 0) - { - wcmdbuf++; - total += ret; - if (total > MAX_ARGS_LEN) - { - printf("Not enough memory\n"); - close(fd); - return ; - } - } - close(fd); -} - -void make_args() -{ - int cI = 0, argI=0; - char* argstart = &cmdline[0]; - for (;cI