Skip to content

Commit

Permalink
strip trailing whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
Fred-Barclay committed May 24, 2017
1 parent 997a93e commit 2ed4703
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 33 deletions.
19 changes: 9 additions & 10 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,11 @@ endif
done
sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
rm -fr .etc
ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR)
ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR)
# install apparmor profile
sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d ]; then install -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d; fi;"
install -c -m 0644 etc/firejail-default $(DESTDIR)/$(sysconfdir)/apparmor.d/.
endif
endif
# man pages
install -m 0755 -d $(DESTDIR)/$(mandir)/man1
install -m 0755 -d $(DESTDIR)/$(mandir)/man5
Expand Down Expand Up @@ -174,7 +174,7 @@ uninstall:
rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firejail
rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firemon
rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firecfg

DISTFILES = "src etc platform contrib configure configure.ac Makefile.in install.sh mkman.sh mketc.sh mkdeb.sh mkuid.sh COPYING README RELNOTES"
DISTFILES_TEST = "test/apps test/apps-x11 test/apps-x11-xorg test/root test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/arguments test/fs test/sysutils"

Expand Down Expand Up @@ -211,7 +211,7 @@ rpms:

extras: all
$(MAKE) -C extras/firetools

cppcheck: clean
cppcheck --force .

Expand All @@ -238,7 +238,7 @@ test-apps-x11-xorg:

test-sysutils:
cd test/sysutils; ./sysutils.sh | grep TESTING

test-utils:
cd test/utils; ./utils.sh | grep TESTING

Expand All @@ -252,13 +252,13 @@ endif

test-arguments:
cd test/arguments; ./arguments.sh | grep TESTING

test-fs:
cd test/fs; ./fs.sh | grep TESTING

test-fcopy:
cd test/fcopy; ./fcopy.sh | grep TESTING

test: test-profiles test-fcopy test-fs test-utils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters test-arguments
echo "TEST COMPLETE"

Expand All @@ -284,11 +284,11 @@ test-network:
# requires the same setup as test-network
test-stress:
cd test/stress; ./stress.sh | grep TESTING

# Tesets running a root user
test-root:
cd test/root; su -c ./root.sh | grep TESTING

# OverlayFS is not available on all platforms
test-overlay:
cd test/overlay; ./overlay.sh | grep TESTING
Expand All @@ -297,4 +297,3 @@ test-overlay:

test-all: test-root test-chroot test-network test-appimage test-overlay
echo "TEST COMPLETE"

3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,3 @@ Release 0.9.46 was moved on 0.9.46-bugfixes branch: https://github.com/netblue30

All profiles include /etc/firejail/globals.local for persistent customizations across all applications. For example, you
can set here a global DNS "dns 8.8.8.8". The file is not overwritten during install.



8 changes: 4 additions & 4 deletions RELNOTES
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ firejail (0.9.46) baseline; urgency=low
* feature: allow non-seccomp setup for OverlayFS sandboxes - more work to come
* feature: added a number of Python scripts for handling sandboxes
* feature: allow local customization using .local files under /etc/firejail
* feature: follow-symlink-as-user runtime config option in
* feature: follow-symlink-as-user runtime config option in
/etc/firejail/firejail.config
* feature: follow-symlink-private-bin option in /etc/firejail/firejail.config
* feature: xvfb X11 server support (--x11=xvfb)
Expand All @@ -37,7 +37,7 @@ firejail (0.9.46) baseline; urgency=low
* feature: support overlay, overlay-named and overlay-tmpfs in profile files
* feature: allow PulseAudio sockets in --private-tmp
* feature: --fix-sound support in firecfg
* feature: added support for sandboxing Xpra, Xvfb and Xephyr in
* feature: added support for sandboxing Xpra, Xvfb and Xephyr in
independent sandboxes when started with firejail --x11
* feature: enable automatic X server sandboxing for --x11=xpra
and --x11=xephyr
Expand Down Expand Up @@ -65,7 +65,7 @@ firejail (0.9.44.10) baseline; urgency=low
the return code of /usr/bin/xauth could end up in starting the
sandbox without X11 security extension installed. Problem found/fixed
by Zack Weinberg
* bugfix: ~/.pki directory whitelisted and later blacklisted. This affects
* bugfix: ~/.pki directory whitelisted and later blacklisted. This affects
most browsers, and disables the custom certificates installed by the user
* bugfix: firecfg config fix
* bugfix: gajim security profile fix
Expand Down Expand Up @@ -258,7 +258,7 @@ firejail (0.9.38.6) baseline; urgency=low

firejail (0.9.38.4) baseline; urgency=low
* CVE-2016-7545 submitted by Aleksey Manevich
* bugfixes
* bugfixes
-- netblue30 <[email protected]> Mon, 10 Oct 2016 10:00:00 -0500

firejail (0.9.38.2) baseline; urgency=low
Expand Down
3 changes: 0 additions & 3 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -5011,6 +5011,3 @@ echo " fatal warnings: $HAVE_FATAL_WARNINGS"
echo " Gcov instrumentation: $HAVE_GCOV"
echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL"
echo
3 changes: 0 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,3 @@ echo " fatal warnings: $HAVE_FATAL_WARNINGS"
echo " Gcov instrumentation: $HAVE_GCOV"
echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL"
echo



4 changes: 2 additions & 2 deletions gcov.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ make test-apps-x11
generate
sleep 2

make test-apps-x11-xorg
make test-apps-x11-xorg
generate
sleep 2

make test-filters
make test-filters
generate
sleep 2

Expand Down
1 change: 0 additions & 1 deletion mkasc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@ gpg --clearsign --digest-algo SHA256 < firejail-$1-unsigned > firejail-$1.asc
gpg --verify firejail-$1.asc
gpg --detach-sign --armor firejail-$1.tar.xz
rm firejail-$1-unsigned

7 changes: 0 additions & 7 deletions mkdeb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,3 @@ mv debian.deb ../firejail_$2_1_amd64.deb
echo "if building a 32bit package, rename the deb file manually"
cd ..
rm -fr $CODE_DIR







0 comments on commit 2ed4703

Please sign in to comment.