From 2ed47031cafe685692a0f076871a5361ef7f63ea Mon Sep 17 00:00:00 2001 From: Fred Barclay Date: Wed, 24 May 2017 14:39:28 -0500 Subject: [PATCH] strip trailing whitespace --- Makefile.in | 19 +++++++++---------- README.md | 3 --- RELNOTES | 8 ++++---- configure | 3 --- configure.ac | 3 --- gcov.sh | 4 ++-- mkasc.sh | 1 - mkdeb.sh | 7 ------- 8 files changed, 15 insertions(+), 33 deletions(-) diff --git a/Makefile.in b/Makefile.in index e9aab83c9..0b2455292 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 @@ -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" @@ -211,7 +211,7 @@ rpms: extras: all $(MAKE) -C extras/firetools - + cppcheck: clean cppcheck --force . @@ -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 @@ -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" @@ -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 @@ -297,4 +297,3 @@ test-overlay: test-all: test-root test-chroot test-network test-appimage test-overlay echo "TEST COMPLETE" - diff --git a/README.md b/README.md index ef4f2707e..1ac6988ab 100644 --- a/README.md +++ b/README.md @@ -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. - - - diff --git a/RELNOTES b/RELNOTES index 6b8fdc5c7..763282fb8 100644 --- a/RELNOTES +++ b/RELNOTES @@ -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) @@ -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 @@ -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 @@ -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 Mon, 10 Oct 2016 10:00:00 -0500 firejail (0.9.38.2) baseline; urgency=low diff --git a/configure b/configure index 4e28ac153..2de213647 100755 --- a/configure +++ b/configure @@ -5011,6 +5011,3 @@ echo " fatal warnings: $HAVE_FATAL_WARNINGS" echo " Gcov instrumentation: $HAVE_GCOV" echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL" echo - - - diff --git a/configure.ac b/configure.ac index 594a7abf8..dc59e5b15 100644 --- a/configure.ac +++ b/configure.ac @@ -203,6 +203,3 @@ echo " fatal warnings: $HAVE_FATAL_WARNINGS" echo " Gcov instrumentation: $HAVE_GCOV" echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL" echo - - - diff --git a/gcov.sh b/gcov.sh index 3fbc24e75..092b755af 100755 --- a/gcov.sh +++ b/gcov.sh @@ -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 diff --git a/mkasc.sh b/mkasc.sh index 4d5b73e20..3bbfc6eb5 100755 --- a/mkasc.sh +++ b/mkasc.sh @@ -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 - diff --git a/mkdeb.sh b/mkdeb.sh index 6184277f5..8cd4ebc48 100755 --- a/mkdeb.sh +++ b/mkdeb.sh @@ -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 - - - - - - -