diff options
-rw-r--r-- | .github/workflows/build.yml | 2 | ||||
-rw-r--r-- | .gitlab-ci.yml | 16 | ||||
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | README | 2 | ||||
-rwxr-xr-x | contrib/update_deb.sh | 2 | ||||
-rwxr-xr-x | mkdeb.sh | 2 |
6 files changed, 12 insertions, 16 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f61e19fdc..f1167b78b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml | |||
@@ -62,7 +62,7 @@ jobs: | |||
62 | - name: install dependencies | 62 | - name: install dependencies |
63 | run: sudo apt-get install gcc-12 libapparmor-dev libselinux1-dev expect xzdec whois | 63 | run: sudo apt-get install gcc-12 libapparmor-dev libselinux1-dev expect xzdec whois |
64 | - name: configure | 64 | - name: configure |
65 | run: CC=gcc-12 ./configure --enable-fatal-warnings --enable-analyzer --enable-apparmor --enable-selinux --prefix=/usr | 65 | run: CC=gcc-12 ./configure --prefix=/usr --enable-fatal-warnings --enable-analyzer --enable-apparmor --enable-selinux |
66 | - name: make | 66 | - name: make |
67 | run: make | 67 | run: make |
68 | - name: make install | 68 | - name: make install |
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af590e2e1..6dcb40e67 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml | |||
@@ -9,8 +9,8 @@ build_ubuntu_package: | |||
9 | image: ubuntu:rolling | 9 | image: ubuntu:rolling |
10 | script: | 10 | script: |
11 | - apt-get update -qq | 11 | - apt-get update -qq |
12 | - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian pkg-config python3 gawk | 12 | - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian libapparmor-dev pkg-config python3 gawk |
13 | - ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb | 13 | - ./configure && make deb && dpkg -i firejail*.deb |
14 | - command -V firejail && firejail --version | 14 | - command -V firejail && firejail --version |
15 | - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc | 15 | - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc |
16 | 16 | ||
@@ -18,8 +18,8 @@ build_debian_package: | |||
18 | image: debian:stretch | 18 | image: debian:stretch |
19 | script: | 19 | script: |
20 | - apt-get update -qq | 20 | - apt-get update -qq |
21 | - apt-get install -y -qq build-essential lintian pkg-config gawk | 21 | - apt-get install -y -qq build-essential lintian libapparmor-dev pkg-config gawk |
22 | - ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb | 22 | - ./configure && make deb && dpkg -i firejail*.deb |
23 | - command -V firejail && firejail --version | 23 | - command -V firejail && firejail --version |
24 | 24 | ||
25 | build_redhat_package: | 25 | build_redhat_package: |
@@ -49,14 +49,14 @@ build_src_package: | |||
49 | - command -V firejail && firejail --version | 49 | - command -V firejail && firejail --version |
50 | # - python3 contrib/sort.py etc/*.{profile,inc} | 50 | # - python3 contrib/sort.py etc/*.{profile,inc} |
51 | 51 | ||
52 | build_apparmor: | 52 | build_no_apparmor: |
53 | image: ubuntu:latest | 53 | image: ubuntu:latest |
54 | script: | 54 | script: |
55 | - apt-get update -qq | 55 | - apt-get update -qq |
56 | - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian libapparmor-dev pkg-config gawk | 56 | - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian pkg-config gawk |
57 | - ./configure && make deb-apparmor && dpkg -i firejail*.deb | 57 | - ./configure && make dist && ./mkdeb.sh --disable-apparmor && dpkg -i firejail*.deb |
58 | - command -V firejail && firejail --version | 58 | - command -V firejail && firejail --version |
59 | - firejail --version | grep -F 'AppArmor support is enabled' | 59 | - firejail --version | grep -F 'AppArmor support is disabled' |
60 | 60 | ||
61 | debian_ci: | 61 | debian_ci: |
62 | image: registry.salsa.debian.org/salsa-ci-team/ci-image-git-buildpackage:latest | 62 | image: registry.salsa.debian.org/salsa-ci-team/ci-image-git-buildpackage:latest |
@@ -340,10 +340,6 @@ asc: config.mk | |||
340 | deb: dist config.sh | 340 | deb: dist config.sh |
341 | ./mkdeb.sh | 341 | ./mkdeb.sh |
342 | 342 | ||
343 | .PHONY: deb-apparmor | ||
344 | deb-apparmor: dist config.sh | ||
345 | env EXTRA_VERSION=-apparmor ./mkdeb.sh --enable-apparmor | ||
346 | |||
347 | .PHONY: test-compile | 343 | .PHONY: test-compile |
348 | test-compile: dist config.mk | 344 | test-compile: dist config.mk |
349 | cd test/compile; ./compile.sh $(TARNAME)-$(VERSION) | 345 | cd test/compile; ./compile.sh $(TARNAME)-$(VERSION) |
@@ -34,7 +34,7 @@ $ sudo apt-get install git build-essential libapparmor-dev pkg-config gawk | |||
34 | For --selinux option, add libselinux1-dev (libselinux-devel for Fedora). | 34 | For --selinux option, add libselinux1-dev (libselinux-devel for Fedora). |
35 | 35 | ||
36 | We build our release firejail.tar.xz and firejail.deb packages using the following command: | 36 | We build our release firejail.tar.xz and firejail.deb packages using the following command: |
37 | $ make distclean && ./configure && make deb-apparmor | 37 | $ make distclean && ./configure && make deb |
38 | 38 | ||
39 | 39 | ||
40 | Maintainer: | 40 | Maintainer: |
diff --git a/contrib/update_deb.sh b/contrib/update_deb.sh index 26be5484e..aaefc38a8 100755 --- a/contrib/update_deb.sh +++ b/contrib/update_deb.sh | |||
@@ -15,7 +15,7 @@ cd firejail | |||
15 | sed -i "s/# restricted-network .*/restricted-network yes/" \ | 15 | sed -i "s/# restricted-network .*/restricted-network yes/" \ |
16 | etc/firejail.config | 16 | etc/firejail.config |
17 | 17 | ||
18 | make deb-apparmor | 18 | make deb |
19 | sudo dpkg -i firejail*.deb | 19 | sudo dpkg -i firejail*.deb |
20 | echo "Firejail updated." | 20 | echo "Firejail updated." |
21 | cd .. | 21 | cd .. |
@@ -25,7 +25,7 @@ echo "*****************************************" | |||
25 | tar -xJvf "$CODE_ARCHIVE" | 25 | tar -xJvf "$CODE_ARCHIVE" |
26 | #mkdir -p "$INSTALL_DIR" | 26 | #mkdir -p "$INSTALL_DIR" |
27 | cd "$CODE_DIR" | 27 | cd "$CODE_DIR" |
28 | ./configure --prefix=/usr "$@" | 28 | ./configure --prefix=/usr --enable-apparmor "$@" |
29 | make -j2 | 29 | make -j2 |
30 | mkdir debian | 30 | mkdir debian |
31 | DESTDIR=debian make install-strip | 31 | DESTDIR=debian make install-strip |