diff options
author | netblue30 <netblue30@yahoo.com> | 2016-07-25 11:08:11 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-25 11:08:11 -0400 |
commit | 926bdd67831f4d039c76b1164ddcc94452dfda6a (patch) | |
tree | 9ee3e2a1987d1616df0f3d5570690bd98da359de | |
parent | Merge pull request #629 from manevich/patch-2 (diff) | |
parent | Simplify dist target and add missing test/sysutils to tarball (diff) | |
download | firejail-926bdd67831f4d039c76b1164ddcc94452dfda6a.tar.gz firejail-926bdd67831f4d039c76b1164ddcc94452dfda6a.tar.zst firejail-926bdd67831f4d039c76b1164ddcc94452dfda6a.zip |
Merge pull request #646 from reinerh/master
Fix spelling errors found by lintian
-rw-r--r-- | Makefile.in | 23 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | src/faudit/files.c | 2 | ||||
-rw-r--r-- | src/man/firejail.txt | 2 | ||||
-rwxr-xr-x | test/filters/seccomp-dualfilter.exp | 4 |
5 files changed, 13 insertions, 20 deletions
diff --git a/Makefile.in b/Makefile.in index c6147cee7..0903e3b8d 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -284,24 +284,17 @@ uninstall: | |||
284 | rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firemon | 284 | rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firemon |
285 | rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firecfg | 285 | rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firecfg |
286 | 286 | ||
287 | DISTFILES = "src etc platform configure configure.ac Makefile.in install.sh mkman.sh mketc.sh mkdeb.sh COPYING README RELNOTES" | ||
288 | DISTFILES_TEST = "test/apps test/apps-x11 test/environment test/profiles test/utils test/compile test/dist-compile test/filters test/network test/fs test/sysutils" | ||
289 | |||
287 | dist: | 290 | dist: |
288 | make distclean | 291 | make distclean |
289 | rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.bz2 | 292 | rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.bz2 |
290 | mkdir $(NAME)-$(VERSION) | 293 | mkdir -p $(NAME)-$(VERSION)/test |
291 | cd $(NAME)-$(VERSION); cp -a ../src .; cp -a ../etc .; cp -a ../platform .; rm -fr src/tools; cd .. | 294 | cp -a "$(DISTFILES)" $(NAME)-$(VERSION) |
292 | cd $(NAME)-$(VERSION); cp -a ../configure .; cp -a ../configure.ac .; cp -a ../Makefile.in .; cp -a ../install.sh .; cp -a ../mkman.sh .; cp -a ../mketc.sh .; cp -a ../mkdeb.sh .;cd .. | 295 | cp -a "$(DISTFILES_TEST)" $(NAME)-$(VERSION)/test |
293 | cd $(NAME)-$(VERSION); cp -a ../COPYING .; cp -a ../README .; cp -a ../RELNOTES .; cd .. | 296 | rm -rf $(NAME)-$(VERSION)/src/tools |
294 | cd $(NAME)-$(VERSION); mkdir -p test; cp -a ../test/profiles test/.; cd .. | 297 | find $(NAME)-$(VERSION) -name .svn -delete |
295 | cd $(NAME)-$(VERSION); mkdir -p test; cp -a ../test/apps test/.; cd .. | ||
296 | cd $(NAME)-$(VERSION); mkdir -p test; cp -a ../test/utils test/.; cd .. | ||
297 | cd $(NAME)-$(VERSION); mkdir -p test; cp -a ../test/apps-x11 test/.; cd .. | ||
298 | cd $(NAME)-$(VERSION); mkdir -p test; cp -a ../test/environment test/.; cd .. | ||
299 | cd $(NAME)-$(VERSION); mkdir -p test; cp -a ../test/compile test/.; cd .. | ||
300 | cd $(NAME)-$(VERSION); mkdir -p test; cp -a ../test/dist-compile test/.; cd .. | ||
301 | cd $(NAME)-$(VERSION); mkdir -p test; cp -a ../test/filters test/.; cd .. | ||
302 | cd $(NAME)-$(VERSION); mkdir -p test; cp -a ../test/network test/.; cd .. | ||
303 | cd $(NAME)-$(VERSION); mkdir -p test; cp -a ../test/fs test/.; cd .. | ||
304 | cd $(NAME)-$(VERSION); rm -fr `find . -name .svn`; rm -fr $(NAME)-$(VERSION); cd .. | ||
305 | tar -cjvf $(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION) | 298 | tar -cjvf $(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION) |
306 | rm -fr $(NAME)-$(VERSION) | 299 | rm -fr $(NAME)-$(VERSION) |
307 | 300 | ||
@@ -49,7 +49,7 @@ Symlinks outside user home directories are allowed: | |||
49 | --whitelist=dirname_or_filename | 49 | --whitelist=dirname_or_filename |
50 | Whitelist directory or file. This feature is implemented only | 50 | Whitelist directory or file. This feature is implemented only |
51 | for user home, /dev, /media, /opt, /var, and /tmp directories. | 51 | for user home, /dev, /media, /opt, /var, and /tmp directories. |
52 | With the exeception of user home, both the link and the real | 52 | With the exception of user home, both the link and the real |
53 | file should be in the same top directory. | 53 | file should be in the same top directory. |
54 | 54 | ||
55 | Example: | 55 | Example: |
diff --git a/src/faudit/files.c b/src/faudit/files.c index e27d3436a..67b43f22b 100644 --- a/src/faudit/files.c +++ b/src/faudit/files.c | |||
@@ -44,7 +44,7 @@ static void check_home_file(const char *name) { | |||
44 | void files_test(void) { | 44 | void files_test(void) { |
45 | struct passwd *pw = getpwuid(getuid()); | 45 | struct passwd *pw = getpwuid(getuid()); |
46 | if (!pw) { | 46 | if (!pw) { |
47 | fprintf(stderr, "Error: cannot retrive user account information\n"); | 47 | fprintf(stderr, "Error: cannot retrieve user account information\n"); |
48 | return; | 48 | return; |
49 | } | 49 | } |
50 | 50 | ||
diff --git a/src/man/firejail.txt b/src/man/firejail.txt index fed573e6c..c9e24380c 100644 --- a/src/man/firejail.txt +++ b/src/man/firejail.txt | |||
@@ -1522,7 +1522,7 @@ firejail version 0.9.27 | |||
1522 | .TP | 1522 | .TP |
1523 | \fB\-\-whitelist=dirname_or_filename | 1523 | \fB\-\-whitelist=dirname_or_filename |
1524 | Whitelist directory or file. This feature is implemented only for user home, /dev, /media, /opt, /var, and /tmp directories. | 1524 | Whitelist directory or file. This feature is implemented only for user home, /dev, /media, /opt, /var, and /tmp directories. |
1525 | With the exeception of user home, both the link and the real file should be in | 1525 | With the exception of user home, both the link and the real file should be in |
1526 | the same top directory. | 1526 | the same top directory. |
1527 | .br | 1527 | .br |
1528 | 1528 | ||
diff --git a/test/filters/seccomp-dualfilter.exp b/test/filters/seccomp-dualfilter.exp index c75063672..8a48130b3 100755 --- a/test/filters/seccomp-dualfilter.exp +++ b/test/filters/seccomp-dualfilter.exp | |||
@@ -9,13 +9,13 @@ match_max 100000 | |||
9 | 9 | ||
10 | send -- "./syscall_test\r" | 10 | send -- "./syscall_test\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING SKIP: 64-bit support missing\n";exit} | 12 | timeout {puts "\nTESTING SKIP: 64-bit support missing\n";exit} |
13 | "Usage" | 13 | "Usage" |
14 | } | 14 | } |
15 | 15 | ||
16 | send -- "./syscall_test32\r" | 16 | send -- "./syscall_test32\r" |
17 | expect { | 17 | expect { |
18 | timeout {puts "TESTING SKIP: 32-bit support missing\n";exit} | 18 | timeout {puts "\nTESTING SKIP: 32-bit support missing\n";exit} |
19 | "Usage" | 19 | "Usage" |
20 | } | 20 | } |
21 | 21 | ||