aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Fred Barclay <Fred-Barclay@users.noreply.github.com>2017-05-24 14:39:28 -0500
committerLibravatar Fred Barclay <Fred-Barclay@users.noreply.github.com>2017-05-24 14:39:28 -0500
commit2ed47031cafe685692a0f076871a5361ef7f63ea (patch)
tree689de7ee6ca57bced1178a3143ac5549e9b294cf
parentstrip trailing whitespace from test/ (diff)
downloadfirejail-2ed47031cafe685692a0f076871a5361ef7f63ea.tar.gz
firejail-2ed47031cafe685692a0f076871a5361ef7f63ea.tar.zst
firejail-2ed47031cafe685692a0f076871a5361ef7f63ea.zip
strip trailing whitespace
-rw-r--r--Makefile.in19
-rw-r--r--README.md3
-rw-r--r--RELNOTES8
-rwxr-xr-xconfigure3
-rw-r--r--configure.ac3
-rwxr-xr-xgcov.sh4
-rwxr-xr-xmkasc.sh1
-rwxr-xr-xmkdeb.sh7
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
122 done 122 done
123 sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" 123 sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
124 rm -fr .etc 124 rm -fr .etc
125ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) 125ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR)
126 # install apparmor profile 126 # install apparmor profile
127 sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d ]; then install -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d; fi;" 127 sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d ]; then install -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d; fi;"
128 install -c -m 0644 etc/firejail-default $(DESTDIR)/$(sysconfdir)/apparmor.d/. 128 install -c -m 0644 etc/firejail-default $(DESTDIR)/$(sysconfdir)/apparmor.d/.
129endif 129endif
130 # man pages 130 # man pages
131 install -m 0755 -d $(DESTDIR)/$(mandir)/man1 131 install -m 0755 -d $(DESTDIR)/$(mandir)/man1
132 install -m 0755 -d $(DESTDIR)/$(mandir)/man5 132 install -m 0755 -d $(DESTDIR)/$(mandir)/man5
@@ -174,7 +174,7 @@ uninstall:
174 rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firejail 174 rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firejail
175 rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firemon 175 rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firemon
176 rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firecfg 176 rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firecfg
177 177
178DISTFILES = "src etc platform contrib configure configure.ac Makefile.in install.sh mkman.sh mketc.sh mkdeb.sh mkuid.sh COPYING README RELNOTES" 178DISTFILES = "src etc platform contrib configure configure.ac Makefile.in install.sh mkman.sh mketc.sh mkdeb.sh mkuid.sh COPYING README RELNOTES"
179DISTFILES_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" 179DISTFILES_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"
180 180
@@ -211,7 +211,7 @@ rpms:
211 211
212extras: all 212extras: all
213 $(MAKE) -C extras/firetools 213 $(MAKE) -C extras/firetools
214 214
215cppcheck: clean 215cppcheck: clean
216 cppcheck --force . 216 cppcheck --force .
217 217
@@ -238,7 +238,7 @@ test-apps-x11-xorg:
238 238
239test-sysutils: 239test-sysutils:
240 cd test/sysutils; ./sysutils.sh | grep TESTING 240 cd test/sysutils; ./sysutils.sh | grep TESTING
241 241
242test-utils: 242test-utils:
243 cd test/utils; ./utils.sh | grep TESTING 243 cd test/utils; ./utils.sh | grep TESTING
244 244
@@ -252,13 +252,13 @@ endif
252 252
253test-arguments: 253test-arguments:
254 cd test/arguments; ./arguments.sh | grep TESTING 254 cd test/arguments; ./arguments.sh | grep TESTING
255 255
256test-fs: 256test-fs:
257 cd test/fs; ./fs.sh | grep TESTING 257 cd test/fs; ./fs.sh | grep TESTING
258 258
259test-fcopy: 259test-fcopy:
260 cd test/fcopy; ./fcopy.sh | grep TESTING 260 cd test/fcopy; ./fcopy.sh | grep TESTING
261 261
262test: test-profiles test-fcopy test-fs test-utils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters test-arguments 262test: test-profiles test-fcopy test-fs test-utils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters test-arguments
263 echo "TEST COMPLETE" 263 echo "TEST COMPLETE"
264 264
@@ -284,11 +284,11 @@ test-network:
284# requires the same setup as test-network 284# requires the same setup as test-network
285test-stress: 285test-stress:
286 cd test/stress; ./stress.sh | grep TESTING 286 cd test/stress; ./stress.sh | grep TESTING
287 287
288# Tesets running a root user 288# Tesets running a root user
289test-root: 289test-root:
290 cd test/root; su -c ./root.sh | grep TESTING 290 cd test/root; su -c ./root.sh | grep TESTING
291 291
292# OverlayFS is not available on all platforms 292# OverlayFS is not available on all platforms
293test-overlay: 293test-overlay:
294 cd test/overlay; ./overlay.sh | grep TESTING 294 cd test/overlay; ./overlay.sh | grep TESTING
@@ -297,4 +297,3 @@ test-overlay:
297 297
298test-all: test-root test-chroot test-network test-appimage test-overlay 298test-all: test-root test-chroot test-network test-appimage test-overlay
299 echo "TEST COMPLETE" 299 echo "TEST COMPLETE"
300
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
70 70
71All profiles include /etc/firejail/globals.local for persistent customizations across all applications. For example, you 71All profiles include /etc/firejail/globals.local for persistent customizations across all applications. For example, you
72can set here a global DNS "dns 8.8.8.8". The file is not overwritten during install. 72can set here a global DNS "dns 8.8.8.8". The file is not overwritten during install.
73
74
75
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
25 * feature: allow non-seccomp setup for OverlayFS sandboxes - more work to come 25 * feature: allow non-seccomp setup for OverlayFS sandboxes - more work to come
26 * feature: added a number of Python scripts for handling sandboxes 26 * feature: added a number of Python scripts for handling sandboxes
27 * feature: allow local customization using .local files under /etc/firejail 27 * feature: allow local customization using .local files under /etc/firejail
28 * feature: follow-symlink-as-user runtime config option in 28 * feature: follow-symlink-as-user runtime config option in
29 /etc/firejail/firejail.config 29 /etc/firejail/firejail.config
30 * feature: follow-symlink-private-bin option in /etc/firejail/firejail.config 30 * feature: follow-symlink-private-bin option in /etc/firejail/firejail.config
31 * feature: xvfb X11 server support (--x11=xvfb) 31 * feature: xvfb X11 server support (--x11=xvfb)
@@ -37,7 +37,7 @@ firejail (0.9.46) baseline; urgency=low
37 * feature: support overlay, overlay-named and overlay-tmpfs in profile files 37 * feature: support overlay, overlay-named and overlay-tmpfs in profile files
38 * feature: allow PulseAudio sockets in --private-tmp 38 * feature: allow PulseAudio sockets in --private-tmp
39 * feature: --fix-sound support in firecfg 39 * feature: --fix-sound support in firecfg
40 * feature: added support for sandboxing Xpra, Xvfb and Xephyr in 40 * feature: added support for sandboxing Xpra, Xvfb and Xephyr in
41 independent sandboxes when started with firejail --x11 41 independent sandboxes when started with firejail --x11
42 * feature: enable automatic X server sandboxing for --x11=xpra 42 * feature: enable automatic X server sandboxing for --x11=xpra
43 and --x11=xephyr 43 and --x11=xephyr
@@ -65,7 +65,7 @@ firejail (0.9.44.10) baseline; urgency=low
65 the return code of /usr/bin/xauth could end up in starting the 65 the return code of /usr/bin/xauth could end up in starting the
66 sandbox without X11 security extension installed. Problem found/fixed 66 sandbox without X11 security extension installed. Problem found/fixed
67 by Zack Weinberg 67 by Zack Weinberg
68 * bugfix: ~/.pki directory whitelisted and later blacklisted. This affects 68 * bugfix: ~/.pki directory whitelisted and later blacklisted. This affects
69 most browsers, and disables the custom certificates installed by the user 69 most browsers, and disables the custom certificates installed by the user
70 * bugfix: firecfg config fix 70 * bugfix: firecfg config fix
71 * bugfix: gajim security profile fix 71 * bugfix: gajim security profile fix
@@ -258,7 +258,7 @@ firejail (0.9.38.6) baseline; urgency=low
258 258
259firejail (0.9.38.4) baseline; urgency=low 259firejail (0.9.38.4) baseline; urgency=low
260 * CVE-2016-7545 submitted by Aleksey Manevich 260 * CVE-2016-7545 submitted by Aleksey Manevich
261 * bugfixes 261 * bugfixes
262 -- netblue30 <netblue30@yahoo.com> Mon, 10 Oct 2016 10:00:00 -0500 262 -- netblue30 <netblue30@yahoo.com> Mon, 10 Oct 2016 10:00:00 -0500
263 263
264firejail (0.9.38.2) baseline; urgency=low 264firejail (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"
5011echo " Gcov instrumentation: $HAVE_GCOV" 5011echo " Gcov instrumentation: $HAVE_GCOV"
5012echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL" 5012echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL"
5013echo 5013echo
5014
5015
5016
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"
203echo " Gcov instrumentation: $HAVE_GCOV" 203echo " Gcov instrumentation: $HAVE_GCOV"
204echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL" 204echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL"
205echo 205echo
206
207
208
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
85generate 85generate
86sleep 2 86sleep 2
87 87
88make test-apps-x11-xorg 88make test-apps-x11-xorg
89generate 89generate
90sleep 2 90sleep 2
91 91
92make test-filters 92make test-filters
93generate 93generate
94sleep 2 94sleep 2
95 95
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
8gpg --verify firejail-$1.asc 8gpg --verify firejail-$1.asc
9gpg --detach-sign --armor firejail-$1.tar.xz 9gpg --detach-sign --armor firejail-$1.tar.xz
10rm firejail-$1-unsigned 10rm firejail-$1-unsigned
11
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
48echo "if building a 32bit package, rename the deb file manually" 48echo "if building a 32bit package, rename the deb file manually"
49cd .. 49cd ..
50rm -fr $CODE_DIR 50rm -fr $CODE_DIR
51
52
53
54
55
56
57