Commit graph

272 commits

Author SHA1 Message Date
Kelvin M. Klann
e0fa9b9cba
build: deb: add conflict with firejail-profiles (#7141)
Debian has a separate "firejail-profiles" package for the profiles
(besides the main "firejail" package), which conflicts with our package
when trying to install it[1]:

    $ sudo dpkg -i firejail_0.9.80_1_amd64.deb

    FAIL: (Reading database ... 238526 files and directories currently installed.)
    Preparing to unpack ./firejail_0.9.80_1_amd64.deb ...
    Unpacking firejail (0.9.80-1) over (0.9.74-1~0ubuntu22.04.0) ...
    dpkg: error processing archive ./firejail_0.9.80_1_amd64.deb (--install):
     trying to overwrite '/etc/firejail/0ad.profile', which is also in package firejail-
     	profiles 0.9.74-1~0ubuntu22.04.0
    dpkg-deb: error: paste subprocess was killed by signal (Broken pipe)
    Errors were encountered while processing:
     ./firejail_0.9.80_1_amd64.deb

So add a `Conflicts:` line for "firejail-profiles".

Relates to #7110.

[1] https://github.com/netblue30/firejail/issues/7072#issuecomment-4273240052

Reported-by: @ginto37
2026-04-25 10:54:43 +00:00
netblue30
2a5062c800 copyright 2014-2026 all over the place 2025-12-30 08:20:44 -05:00
netblue30
212ac3cb19 update copyright 2025-01-12 19:26:24 -05:00
Kelvin M. Klann
2301ab2348 build: standardize ./configure arguments
For consistency and to make it clearer where jobs differ (for example,
to see where `--enable-analyzer` is used).

Changes:

* Always use --prefix=/usr and --enable-fatal-warnings (except in the
  Alpine job due to current warnings; see #6224)
* Use the same argument order

Note: mkdeb.sh and platform/rpm/mkrpm.sh already pass `--prefix=/usr` to
./configure.
2024-02-29 08:52:25 -03:00
Kelvin M. Klann
44b4657969 build: mkrpm.sh: allow / in configure args 2024-02-07 10:24:04 -03:00
Kelvin M. Klann
3c86526b81 build: mkrpm.sh: use set -e
To abort the build if any error occurs.

See also commit 7d9db8355 ("fail build if any step in the script fails",
2019-06-21).
2024-02-07 10:24:04 -03:00
Kelvin M. Klann
0edc987645 build: mkrpm.sh: remove --quiet from rpmbuild
To make the CI logs more informative, as currently nothing from the
build itself is shown.

Added on commit d684d9988 ("Fix mkrpm.sh", 2016-02-16) / PR #297.
2024-02-07 10:24:04 -03:00
Kelvin M. Klann
58e0b5c01b build: fix codespell warnings
Warnings:

    $ make codespell
    Running codespell...
    ./README:757: Manuel ==> Manual
    ./RELNOTES:269: relpaced ==> replaced
    ./src/firecfg/desktop_files.c:60: diectory ==> directory
    ./platform/debian/control.i386:11: namepaces ==> namespaces
    ./platform/debian/control.amd64:11: namepaces ==> namespaces
    make: *** [Makefile:383: codespell] Error 65
    $ codespell --version
    2.2.6
2024-02-01 22:31:18 -03:00
netblue30
ae8f62dba0 update copyright 2024 2024-01-12 11:23:22 -05:00
Kelvin M. Klann
8fd9ab03d6 build: mkrpm.sh: append instead of override configure args
For consistency with mkdeb.sh.

Note: The default arguments and support for argument overriding was
added to to mkrpm.sh on commit 3d97332fd ("Add configure options when
building rpm (#3422)", 2020-05-19).

The support for appending arguments was added to mkdeb.sh on commit
9a0fbbd71 ("mkdeb.sh.in: pass remaining arguments to ./configure",
2022-05-13) / PR #5154.
2023-12-13 01:15:04 -03:00
Kelvin M. Klann
200f389ed0 build: use config.sh in more scripts
This removes the need to manually pass variables such as `$(TARNAME)`
and `$(VERSION)` to shell scripts in the root Makefile.

Relates to #5140.
2023-07-28 14:10:31 -03:00
Kelvin M. Klann
59ed39ec46 build: fix shellcheck issues in mkrpm.sh/compile.sh 2023-07-28 14:08:01 -03:00
Kelvin M. Klann
71d7572950 editorconfig: add indentation rules
Commands used to list the file extensions used in the project:

    $ git ls-files | sed -En 's/.*(\.[^.]+)$/\1/p' |
      LC_ALL=C sort | uniq -c

For rules that are more specific to a given directory, put a dedicated
.editorconfig file in it.
2023-02-20 18:07:09 -03:00
Kelvin M. Klann
6648a1e968 *.sh: use consistent indentation
Almost all of the shell scripts in the repository use tabs for
indentation (or have no indentation at all):

    $ git grep -Il '^\t' -- '*.sh' | wc -l
    19
    $ git grep -Il '^ ' -- '*.sh' | wc -l
    5
    $ git grep -IL '^[ \t]' -- '*.sh' | wc -l
    25

So do the same in the few shell scripts that currently use spaces for
indentation.

Except for the following file:

* platform/rpm/mkrpm.sh

Not sure if it's following a packaging-specific scheme, so just fix the
one indentation inconsistency in it and otherwise leave it as is for
now.

Command used to search for shell scripts using spaces for indentation:

    $ git grep -In '^ ' -- '*.sh'
2023-02-20 17:39:31 -03:00
David Fetter
2dc16cc247
Update copyright to 2023 (#5664) 2023-02-15 18:57:44 +00:00
netblue30
121749f0ca 2022 copyright update 2022-01-07 12:23:47 -05:00
Reiner Herrmann
e9a33e4e6c rpm: fix man page location in spec file 2021-06-06 01:08:24 +02:00
netblue30
b79e4416fe jailtest -> jailcheck (#4268) 2021-05-18 13:49:02 -04:00
Reiner Herrmann
954119fc73 build: include jailtest in rpm 2021-02-21 17:18:16 +01:00
startx2017
2609e5cf0b copyright update 2021-02-15 08:33:05 -05:00
Reiner Herrmann
a1160c17bb build: include zsh completion in rpm 2021-02-14 18:39:05 +01:00
Reiner Herrmann
8ec77242d9 include tests in rpm source tarball 2020-10-24 23:27:08 +02:00
netblue30
bbf10833d5 more on email change 2020-10-03 08:51:18 -04:00
rusty-snake
28c099bdc3 ${RUNUSER} blacklisting + typo 2020-05-27 12:07:09 +02:00
Haowei Yu
3d97332fd2
Add configure options when building rpm (#3422) 2020-05-19 17:04:09 +00:00
glitsj16
8b930734d2
move copyright statement to 2020 (part 3) (#3182)
* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020
2020-01-24 22:59:32 +00:00
rusty-snake
282bab5ced misc fixes
- fix for #2038
 - update RELNOTES
 - fix #2925
2019-08-26 09:23:04 +02:00
smitsohu
2323a45ca7 move more copyright statements to 2019 2019-02-07 17:47:23 +01:00
Tad
3f6643d40f Misc fixes 2018-08-22 20:54:28 -04:00
netblue30
d9b1eca97e minor cleanup 2018-08-19 08:21:09 -04:00
Tad
5c19c42399 Replace all possible HTTP links with HTTPS 2018-08-08 19:57:48 -04:00
netblue30
14faf11d2d centos testing 2018-04-26 10:36:27 -04:00
Tad
33f7854f68 Fix rpm build 2018-04-09 15:25:30 -04:00
Reiner Herrmann
59fb1d9f27 rpm: install all files in lib directory 2018-01-23 19:21:40 +01:00
netblue30
8600e859d9 0.9.52 testing 2017-12-12 07:58:50 -05:00
netblue30
e84252dce0 0.9.52 testing 2017-12-07 10:27:09 -05:00
Reiner Herrmann
157bf58b14 typos 2017-10-22 19:56:51 +02:00
Reiner Herrmann
e429a092c7 extra priority is deprecated, switch to optional 2017-10-17 18:22:49 +02:00
Reiner Herrmann
2f8f4be99a Get rid of conffiles list, generate it during package build 2017-10-17 00:14:39 +02:00
netblue30
d0e335e600 fixed make deb 2017-10-16 07:49:55 -04:00
netblue30
408c061ea8 add xcalc profile 2017-10-09 17:02:55 -04:00
Reiner Herrmann
b66676c5c5 rpm: firejail-config manpage no longer exists
Fixes #1583
2017-09-30 12:38:13 +02:00
startx2017
5baa65b06e make rpm 2017-09-23 09:19:29 -04:00
startx2017
b8e570513d make deb 2017-09-23 08:13:01 -04:00
netblue30
0ec8ec6337 added ffmpeg.profile, removed ssh-agent from firecfg 2017-09-21 08:15:19 -04:00
netblue30
efcda9cb5f whitelisting /var 2017-09-17 11:27:51 -04:00
netblue30
bc31d4f362 merge fixes from 0.9.50-bugfixes branch 2017-09-11 17:01:20 -04:00
Tad
57f812f843 Add a profile for Minetest 2017-09-06 23:08:40 -04:00
netblue30
cfc27a837e merge yandex browser 2017-09-02 11:30:07 -04:00
Topi Miettinen
cb5d361a7b
Improve seccomp support for non-x86 architectures 2017-09-02 14:05:31 +03:00