Commit graph

645 commits

Author SHA1 Message Date
netblue30
01d3f4cd60 merges 2023-01-25 11:24:22 -05:00
netblue30
ebb8d8390e Merge branch 'master' of ssh://github.com/netblue30/firejail 2023-01-18 10:37:18 -05:00
netblue30
594fb293cd merges 2023-01-18 10:37:03 -05:00
netblue30
70974170c7
Merge pull request #5589 from nya1/fix/apparmor-invalid-command-line-option
docs: remove apparmor options in --help when building without apparmor support
2023-01-18 10:29:57 -05:00
netblue30
15c68e21df merges 2023-01-16 08:34:09 -05:00
netblue30
8a7fc9988a
Merge pull request #5563 from glitsj16/linuxqq
New profiles: linuxqq/qq
2023-01-15 09:24:12 -05:00
nya1
ed16bdfdfd chore: update readme with flag to enable apparmor on ./configure 2023-01-14 16:04:43 +01:00
netblue30
24dd0a27d0 merges 2023-01-04 15:56:53 -05:00
glitsj16
7e1a35a9d1
README: add linuxqq/qq contributors 2023-01-03 08:09:27 +00:00
netblue30
65c92b464e fixes 2022-12-14 14:32:22 -05:00
netblue30
01f9dc87bf small nettrace fixes 2022-12-09 10:27:02 -05:00
netblue30
db14402669 compile fix 2022-10-11 11:28:46 -04:00
netblue30
5b4c5211e6 merges 2022-09-26 10:56:03 -04:00
netblue30
d900d53196 README/README.md
Committer note: This is the same as commit 796fa0963
("README/README.md", 2022-08-30) and commit 0594c5d3d ("typos",
2022-08-30) but without the Landlock-related changes.
2022-09-05 01:07:41 -03:00
Kelvin M. Klann
bfcacff665 Revert "tracelog disabled by default in /etc/firejail/firejail.config file"
This reverts commit 6e687c3011.

Part of reverting commits with Landlock-related changes.
2022-09-05 01:07:41 -03:00
Kelvin M. Klann
2a79f3a268 Revert "README/README.md"
This reverts commit 796fa09636.

Part of reverting commits with Landlock-related changes.
2022-09-05 01:07:41 -03:00
netblue30
796fa09636 README/README.md 2022-08-30 09:10:55 -04:00
netblue30
6e687c3011 tracelog disabled by default in /etc/firejail/firejail.config file 2022-08-29 12:30:05 -04:00
netblue30
07a5f9db6f more merges 2022-08-14 09:37:52 -04:00
netblue30
d4323ae26f merges 2022-08-14 09:00:01 -04:00
netblue30
502b9bbd90 testing fix 2022-07-10 11:07:46 -04:00
netblue30
32ec5b0d82 merges 2022-06-30 09:18:11 -04:00
netblue30
f483fc0a6f 0.9.71 2022-06-12 11:02:59 -04:00
Kelvin M. Klann
1ed4afb0d1 mkdeb.sh.in: stop enabling apparmor
Since `make deb-apparmor` already exists, use that for now instead of
changing what `make deb` does.

This fixes CI.

Added on commit 494b26d50 ("adding --enable-apparmor by default for make
deb - most Debian-based distros have apparmor enabled by default",
2022-06-03).

Kind of relates to #5154.
2022-06-05 14:31:28 -03:00
netblue30
494b26d504 adding --enable-apparmor by default for make deb - most Debian-based distros have apparmor enabled by default 2022-06-03 09:52:23 -04:00
netblue30
ba614a0b75 merges 2022-05-30 11:45:12 -04:00
netblue30
95aa71c073 merges, fix compile 2022-04-25 15:44:10 -04:00
netblue30
0aff61d8d9 documentation (#5107) 2022-04-17 12:04:29 -04:00
netblue30
5b4b1ce916 merges 2022-03-29 11:46:13 -04:00
netblue30
c254873bbe merges 2022-03-24 08:35:53 -04:00
netblue30
837ef77091 moving videos to Odysee 2022-03-11 10:04:33 -05:00
smitsohu
d38b9c42ff merge 2022-03-11 15:42:10 +01:00
netblue30
4813218810 merges 2022-03-05 07:36:10 -05:00
netblue30
30e5c12407 evince fix 2022-02-22 09:43:51 -05:00
netblue30
ddd7e6fec6 merges 2022-02-20 08:20:45 -05:00
netblue30
4211ee323f merges 2022-02-04 12:14:10 -05:00
netblue30
2f2829496d merges 2022-02-03 09:33:00 -05:00
netblue30
f9d50521f7 small fixes 2022-01-31 09:43:22 -05:00
netblue30
5356609ae9 merges 2022-01-24 13:15:17 -05:00
netblue30
94122ddc63 merges 2022-01-24 13:01:07 -05:00
netblue30
f9f6e4b5ea merges 2022-01-24 12:49:41 -05:00
netblue30
733520a871 merges 2022-01-24 12:11:23 -05:00
netblue30
eb62d7d09c merges 2022-01-12 08:40:42 -05:00
netblue30
6c7bf8d033 merge updates 2022-01-08 17:42:12 -05:00
netblue30
121749f0ca 2022 copyright update 2022-01-07 12:23:47 -05:00
netblue30
15759cb51c updates 2021-12-28 13:55:47 -05:00
netblue30
94144073ad updates 2021-12-19 17:14:17 -05:00
glitsj16
e282e792cd
add credit for #4783 2021-12-19 04:07:52 +00:00
netblue30
3fc2b91a82 testing 2021-12-18 19:07:08 -05:00
netblue30
3a39024f43 updates 2021-12-08 12:39:31 -05:00