aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAge
* makefiles: deduplicate many makefiles into common.mkLibravatar Kelvin M. Klann2022-11-21
| | | | | | | | | | The makefiles that both build C programs and include src/common.mk are nearly identical, save for the main target name and for any extra headers and objects that they might use. So move all of their (duplicated) code into src/common.mk, which (other than the "lib" target on src/lib/Makefile) leaves only variables and the includes of config.mk and src/common.mk in place.
* makefiles: deduplicate main target name into new PROG varLibravatar Kelvin M. Klann2022-11-21
| | | | | | | | | | Put the main target name into a new PROG variable, put PROG into a new TARGET variable, make "all" depend on `$(TARGET)` and replace every other occurrence of the main target name with `$(PROG)`. On the makefiles that build non-shared objects, to make them more similar. With this commit, all of their targets are identical (except for the extra "lib" target on src/lib/Makefile).
* makefiles: line-wrap MOD_HDRS and MOD_OBJSLibravatar Kelvin M. Klann2022-11-21
| | | | | For increased readability, list one item per line on lines that are currently longer than 80 characters.
* makefiles: move extra deps into new MOD varsLibravatar Kelvin M. Klann2022-11-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To make the makefiles more similar. That is, add the following new variables: * MOD_HDRS * MOD_SRCS * MOD_OBJS And move existing module-specific header and object dependencies into `MOD_HDRS` and `MOD_OBJS`, respectively. `MOD_SRCS` is added mostly for symmetry/consistency. Note: Use `MOD_` as a prefix instead of `EXTRA_` to avoid confusion, as the latter is currently used for global variables (such as `EXTRA_CFLAGS`), as opposed to module-specific variables. Note2: Add them directly into the HDRS/SRCS/OBJS variables to avoid cluttering the existing recipes with an extra variables unnecessarily. This also allows, for example, referencing all of the object dependencies with `$<` if `$(OBJS)` is the first dependency (at least in GNU make). Note3: Since HDRS/SRCS/OBJS use simple assignment (through `:=`), the MOD variables should appear before including src/common.mk (or src/so.mk).
* makefiles: expand HDRS, SRCS and OBJS immediatelyLibravatar Kelvin M. Klann2022-11-21
| | | | | | | | | | | | | | | | | | Use immediate expansion of the right-hand side (with `:=`) to set the variables to the output of the commands rather than to the (text of the) commands themselves. This should prevent deferred/lazy evaluation, which is something that might potentially result in the relevant files being looked up each time that HDRS and SRCS are evaluated. Commands used to search and replace: git grep -Ilz '^SRCS' -- src | xargs -0 -I '{}' \ sh -c "printf '%s\n' \"\$(sed \ -e 's/^HDRS =/HDRS :=/' \ -e 's/^SRCS =/SRCS :=/' \ -e 's/^OBJS =/OBJS :=/' '{}')\" >'{}'"
* makefiles: rename H_FILE_LIST and C_FILE_LISTLibravatar Kelvin M. Klann2022-11-21
| | | | | | | | | | | | | | | | | | | To HDRS and SRCS, respectively. To be more consistent with the OBJS variable. Misc: These names also appear to be more common from the makefiles that I've seen. Commands used to search and replace: git grep -IFlz -e H_FILE_LIST -e C_FILE_LIST -- src | xargs -0 -I '{}' sh -c "printf '%s\n' \"\$(sed \ -e 's/^H_FILE_LIST *=/HDRS =/' \ -e 's/\$(H_FILE_LIST)/\$(HDRS)/g' \ -e 's/^C_FILE_LIST *=/SRCS =/' \ -e 's/\$(C_FILE_LIST:/\$(SRCS:/g' \ '{}')\" >'{}'"
* makefiles: equalize object dependencies in program targetsLibravatar Kelvin M. Klann2022-11-21
| | | | | | | | | | | | | Compared to the objects that are actually used in a given recipe, some program targets are missing object dependencies, while others appear to have unused object dependencies. Make each of those targets depend on the objects that are actually used when linking. Note: No check was done for extraneous/missing objects when linking; this commit only makes the object dependencies equal to the objects that are linked.
* makefiles: include config.mk directlyLibravatar Kelvin M. Klann2022-11-21
| | | | | | | Instead of including it through src/common.mk. This allows each makefile to directly override any value defined in config.mk.
* lib/Makefile: put all target before include of common.mkLibravatar Kelvin M. Klann2022-11-20
| | | | | | | | | | | | | | | | | | | The "all" target is usually intended to be the default one and when running make, the first target on a makefile is the one that gets built if no target is specified (such as when running `make` with no arguments). Also, note that unlike config.mk, src/common.mk may define its own targets, so move the "all" target to before the include of src/common.mk, to ensure that "all" keeps being the default target regardless of what is defined in src/common.mk. Note: If the "all" target is defined as depending directly on `$(OBJS)` while it is empty (that is, before src/common.mk is included), running `make` (or `make all`) will result in make always concluding that there is nothing to be done and exiting. So make "all" depend on an intermediary phony "lib" target instead, which in turn depends on `$(OBJS)` (and is declared after `$(OBJS)` is populated).
* makefiles: remove unused BINOBJS variableLibravatar Kelvin M. Klann2022-11-20
| | | | | | | | | | | | | | | | It is unclear what its intended purpose would be. Example: $ cat Makefile OBJS = a b c BINOBJS = $(foreach file, $(OBJS), $file) all: printf '"%s"\n' "$(BINOBJS)" $ make printf '"%s"\n' " ile ile ile" " ile ile ile" Added on commit 137985136 ("Baseline firejail 0.9.28", 2015-08-08).
* fids/Makefile: remove code commentLibravatar Kelvin M. Klann2022-11-20
| | | | Added on commit a627071b3 ("intrusion detection system", 2021-07-28).
* Merge pull request #5451 from kmk3/docs-clarify-appimageLibravatar Kelvin M. Klann2022-11-20
|\ | | | | docs: clarify that --appimage should appear before --profile
| * docs: clarify that --appimage should appear before --profileLibravatar Kelvin M. Klann2022-11-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And fix the argument order in the examples to reflect that. Background: The order in which these options appeared in the documentation was inconsistent. src/man/firejail.txt used --appimage before --profile and src/man/firejail-profile.txt used --profile before --appimage. Then commit 44fefcac0 ("Make appimage examples consistent with --appimage option short description", 2022-10-05) / PR #5402 was made, which standardized on --profile before --appimage in both places. But as mentioned by @rusty-snake[1], --appimage has be specified before --profile in order for any `?HAS_APPIMAGE` conditionals inside of the profile to evaluate to true. So change the documentation to use and recommend the latter form. Also, add --quiet to one example to make it clear that --appimage does not have to be the first option (nor the last option before --profile). [1] https://github.com/netblue30/firejail/pull/5402#issuecomment-1274889618
* | Add support for cinelerra-gg (#5467)Libravatar glitsj162022-11-13
| | | | | | | | | | | | | | * Create cinelerra-gg * add cinelerra-gg to `New profiles` section * Add cinelerra-gg to firecfg.config
* | Add godot3 redirect (#5456)Libravatar Frostbyte46642022-11-07
|/ | | | | * Create godot3.profile * Add godot3 redirect to firecfg.config
* compile fixLibravatar netblue302022-10-25
|
* nettrace: various fixesLibravatar netblue302022-10-25
|
* removed grsecurity supportLibravatar netblue302022-10-24
|
* --icmptraceLibravatar netblue302022-10-24
|
* check for availability of symbols instead of glibc definesLibravatar Reiner Herrmann2022-10-23
| | | | in musl they are just redefines of the non-64 versions
* include limits.h instead of manually defining LINE_MAXLibravatar Reiner Herrmann2022-10-23
|
* remove deprecated --shell from man pageLibravatar netblue302022-10-23
|
* dnstrace and snitraceLibravatar netblue302022-10-23
|
* Merge branch 'master' of ssh://github.com/netblue30/firejailLibravatar netblue302022-10-11
|\
| * Merge pull request #5402 from slowpeek/masterLibravatar netblue302022-10-11
| |\ | | | | | | docs: Make appimage examples consistent with --appimage option short description
| | * Make appimage examples consistent with --appimage option short descriptionLibravatar slowpeek2022-10-05
| | |
* | | compile fixLibravatar netblue302022-10-11
|/ /
* / nettrace-dns and nettrace-sniLibravatar netblue302022-10-11
|/
* nettrace - static ip map updateLibravatar netblue302022-10-04
|
* ICMP support in --nettraceLibravatar netblue302022-09-27
|
* fix --netlock (#5312)Libravatar netblue302022-09-26
|
* update ip addr list for --nettraceLibravatar netblue302022-09-26
|
* join network/filesystem fixesLibravatar netblue302022-09-26
|
* docs: man: Note that some commands can be disabled in firejail.config (#5366)Libravatar glitsj162022-09-14
| | | | | | | | | | | | | | | | | * [man firejail] Make it explicit that some options are disabled by default in firejail.config * Reword firejail.config notes * Only add relevant firejail.config option in notes * move firejail.config notes to the end of each section * fix tracelog note * fix erroneous line break * really fix erroneous line break Co-authored-by: Kelvin M. Klann <kmk3.code@protonmail.com>
* docs: change /foo to /bar in symlink handling exampleLibravatar Kelvin M. Klann2022-09-06
| | | | | | | | | As suggested by @birdie-github[1]. This amends commit c78c2b4ec ("docs: note that blacklist/whitelist follow symlinks", 2022-08-28) / PR #5344. [1] https://github.com/netblue30/firejail/pull/5344#issuecomment-1229903967
* tracelog disabled by default in /etc/firejail/firejail.config fileLibravatar netblue302022-09-05
| | | | | | Committer note: This is the same as commit 6e687c301 ("tracelog disabled by default in /etc/firejail/firejail.config file", 2022-08-29) but without the Landlock-related changes.
* Revert "Merge pull request #5315 from ChrysoliteAzalea/landlock"Libravatar Kelvin M. Klann2022-09-05
| | | | | | | | | | | This reverts commit 54cb3e741e972c754e595d56de0bca0792299f83, reversing changes made to 97b1e02d5f4dca4261dc9928f8a5ebf8966682d7. There were many issues and requests for changes raised in the pull request (both code-wise and design-wise) and most of them are still unresolved[1]. [1] https://github.com/netblue30/firejail/pull/5315
* Revert "compile fix"Libravatar Kelvin M. Klann2022-09-05
| | | | | | This reverts commit 836ffe37ff891886f15243eacc70963368d57a3f. Part of reverting commits with Landlock-related changes.
* Revert "tracelog disabled by default in /etc/firejail/firejail.config file"Libravatar Kelvin M. Klann2022-09-05
| | | | | | This reverts commit 6e687c30110a52f267c1779c4eeab82bded9cb77. Part of reverting commits with Landlock-related changes.
* Revert "landlock: support in firejail --version"Libravatar Kelvin M. Klann2022-09-05
| | | | | | This reverts commit 2f3c19a87dd49b220f69f27f8c14c627277355d6. Part of reverting commits with Landlock-related changes.
* Add profile for chafa (#5355)Libravatar alkim02022-09-04
| | | Co-authored-by: Albert Kim <alkim@alkim.org>
* landlock: support in firejail --versionLibravatar netblue302022-09-04
|
* tracelog disabled by default in /etc/firejail/firejail.config fileLibravatar netblue302022-08-29
|
* compile fixLibravatar netblue302022-08-29
|
* Merge pull request #5315 from ChrysoliteAzalea/landlockLibravatar netblue302022-08-29
|\ | | | | Add Landlock support to Firejail
| * tinyLL has been removed as it's no longer neededLibravatar Азалия Смарагдова2022-08-16
| |
| * Proposed fixes.Libravatar Азалия Смарагдова2022-08-16
| |
| * Update quotation marks in src/zsh_completion/_firejail.inLibravatar Азалия Смарагдова2022-08-15
| | | | | | Co-authored-by: rusty-snake <41237666+rusty-snake@users.noreply.github.com>
| * Landlock functions are added to the code of Firejail, removing the ↵Libravatar Азалия Смарагдова2022-08-15
| | | | | | | | dependency on tinyLL
| * Landlock support has been added.Libravatar Азалия Смарагдова2022-08-15
| |