From f7f89a2ece36fd4a9d7b0a69e563832fff318035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Davi=20Ant=C3=B4nio=20da=20Silva=20Santos?= Date: Wed, 1 Mar 2023 23:33:37 -0300 Subject: Populate dbgsym packages with debug symbols Generate debug symbols by adding the `-g` flag to the `gcc` command and populate the dbgsym packages generated by the tooling with the required debug symbols. This fixes the following Lintian warnings: * boca-autojudge-dbgsym: debug-file-with-no-debug-symbols * boca-submission-tools-dbgsym: debug-file-with-no-debug-symbols --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6ec0a69..3675033 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ tools/safeexec: tools/safeexec.c - gcc tools/safeexec.c -o tools/safeexec + gcc -g tools/safeexec.c -o tools/safeexec tools/boca-submit-run-root-wrapper: tools/boca-submit-run-root-wrapper.c - gcc $^ -o $@ + gcc -g $^ -o $@ install-bocawww: mkdir -p $(DESTDIR)/usr/sbin $(DESTDIR)/etc/cron.d $(DESTDIR)/var/www/boca/ -- cgit v1.2.3 From f17e3be93d425f5554a806c0e847c34504a68873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Davi=20Ant=C3=B4nio=20da=20Silva=20Santos?= Date: Thu, 2 Mar 2023 16:23:25 -0300 Subject: Remove Apache HTTPD commands from Makefile The package Makefile contained Apache HTTPD commands, and some of them were repeated in the boca-web post installation maintainer script. The commands were removed from the Makefile, as this requires having a valid apache2 installation as a build dependency. --- Makefile | 3 --- 1 file changed, 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3675033..dcb2d35 100644 --- a/Makefile +++ b/Makefile @@ -16,9 +16,6 @@ install-bocawww: install-bocaapache: mkdir -p $(DESTDIR)/etc/apache2/sites-enabled/ cp tools/000-boca.conf $(DESTDIR)/etc/apache2/sites-enabled/000-boca.conf - a2ensite default-ssl || echo a2ensite default-ssl FAILED - a2enmod ssl || echo a2enmod ssl FAILED - a2enmod socache_shmcb || echo a2enmod socache_shmcb FAILED install-scripts: mkdir -p $(DESTDIR)/usr/sbin/ -- cgit v1.2.3 From 7c0f371cfb3ad3d876325dd0e8e2f9e74e8b5e22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Davi=20Ant=C3=B4nio=20da=20Silva=20Santos?= Date: Thu, 2 Mar 2023 20:56:08 -0300 Subject: Use automatic variables to compile tools/safeexec Replace redundant recipe for tools/safeexec rule with automatic variables: * `$^` expands to the names of all rule's prerequistes * `$@` expands to the name of the rule's target Further information is available in https://www.gnu.org/software/make/manual/make.html. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index dcb2d35..0674ac2 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ tools/safeexec: tools/safeexec.c - gcc -g tools/safeexec.c -o tools/safeexec + gcc -g $^ -o $@ tools/boca-submit-run-root-wrapper: tools/boca-submit-run-root-wrapper.c gcc -g $^ -o $@ -- cgit v1.2.3 From d73ed8c16a6eaf84a8a40d529668534edb38b443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Davi=20Ant=C3=B4nio=20da=20Silva=20Santos?= Date: Fri, 3 Mar 2023 11:21:48 -0300 Subject: Enable compiler optimisations The tools safeexec and boca-submit-run-root-wrapper are now built with optimisations (gcc optimisation level 2). --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0674ac2..d30200c 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ tools/safeexec: tools/safeexec.c - gcc -g $^ -o $@ + gcc -g -O2 $^ -o $@ tools/boca-submit-run-root-wrapper: tools/boca-submit-run-root-wrapper.c - gcc -g $^ -o $@ + gcc -g -O2 $^ -o $@ install-bocawww: mkdir -p $(DESTDIR)/usr/sbin $(DESTDIR)/etc/cron.d $(DESTDIR)/var/www/boca/ -- cgit v1.2.3 From e3ed13ce5dc654fb36f94ffb2a20744cff2cd77f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Davi=20Ant=C3=B4nio=20da=20Silva=20Santos?= Date: Fri, 3 Mar 2023 16:48:41 -0300 Subject: Add clean rule to the Makefile A clean rule was added to the Makefile, to remove compiled binaries. This fixes Lintian's tag source-contains-prebuilt-binary. --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d30200c..1645d87 100644 --- a/Makefile +++ b/Makefile @@ -49,6 +49,10 @@ install-bocaautojudge: tools/safeexec install: install-bocawww install-bocaapache install-bocadb install-bocacommon install-bocaautojudge install-scripts +clean: + $(RM) tools/safeexec + $(RM) tools/boca-submit-run-root-wrapper + install-submission-tools: tools/boca-submit-run-root-wrapper mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)/usr/sbin $(DESTDIR)/etc/cron.d install tools/boca-auth-runs $(DESTDIR)/usr/sbin/ -- cgit v1.2.3 From b3d5664549235a4b1bc172397deed7b2d1ec8ec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Davi=20Ant=C3=B4nio=20da=20Silva=20Santos?= Date: Fri, 3 Mar 2023 20:45:04 -0300 Subject: Do not overwrite Apache's configuration directory The package boca-web tried to modify Apache's configuration directory, which is forbidden by the Debian Policy and triggers Lintian error apache2-reverse-dependency-ships-file-in-not-allowed-directory. This direct modification was also unnecessary, as it was redone by the post installation maintainer script. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1645d87..172b8cb 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ install-bocawww: chmod 700 $(DESTDIR)/usr/sbin/boca-fixssh install-bocaapache: - mkdir -p $(DESTDIR)/etc/apache2/sites-enabled/ - cp tools/000-boca.conf $(DESTDIR)/etc/apache2/sites-enabled/000-boca.conf + mkdir -p $(DESTDIR)/etc/apache2/sites-available/ + cp tools/000-boca.conf $(DESTDIR)/etc/apache2/sites-available/000-boca.conf install-scripts: mkdir -p $(DESTDIR)/usr/sbin/ -- cgit v1.2.3