diff options
-rw-r--r-- | Makefile | 64 | ||||
-rwxr-xr-x | mkasc.sh | 14 | ||||
-rw-r--r-- | src/fnetlock/main.c | 6 |
3 files changed, 49 insertions, 35 deletions
@@ -293,44 +293,54 @@ uninstall: config.mk | |||
293 | @echo "If you want to install a different version of firejail, you might also need to run 'rm -fr $(DESTDIR)$(sysconfdir)/firejail', see #2038." | 293 | @echo "If you want to install a different version of firejail, you might also need to run 'rm -fr $(DESTDIR)$(sysconfdir)/firejail', see #2038." |
294 | 294 | ||
295 | DISTFILES = \ | 295 | DISTFILES = \ |
296 | COPYING \ | 296 | COPYING \ |
297 | Makefile \ | 297 | Makefile \ |
298 | README \ | 298 | README \ |
299 | RELNOTES \ | 299 | RELNOTES \ |
300 | config.mk.in \ | 300 | config.mk.in \ |
301 | config.sh.in \ | 301 | config.sh.in \ |
302 | configure \ | 302 | configure \ |
303 | configure.ac \ | 303 | configure.ac \ |
304 | contrib \ | 304 | contrib \ |
305 | etc \ | 305 | etc \ |
306 | install.sh \ | 306 | install.sh \ |
307 | m4 \ | 307 | m4 \ |
308 | mkdeb.sh \ | 308 | mkdeb.sh \ |
309 | mketc.sh \ | 309 | mketc.sh \ |
310 | platform \ | 310 | platform \ |
311 | src | 311 | src |
312 | 312 | ||
313 | DISTFILES_TEST = test/Makefile test/apps test/apps-x11 test/apps-x11-xorg test/capabilities test/private-lib test/fnetfilter test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/fs test/sysutils | 313 | DISTFILES_TEST = \ |
314 | test/Makefile \ | ||
315 | test/apps \ | ||
316 | test/apps-x11 \ | ||
317 | test/apps-x11-xorg \ | ||
318 | test/capabilities \ | ||
319 | test/compile \ | ||
320 | test/environment \ | ||
321 | test/fcopy \ | ||
322 | test/filters \ | ||
323 | test/fnetfilter \ | ||
324 | test/fs \ | ||
325 | test/network \ | ||
326 | test/private-lib \ | ||
327 | test/profiles \ | ||
328 | test/sysutils \ | ||
329 | test/utils | ||
314 | 330 | ||
315 | .PHONY: dist | 331 | .PHONY: dist |
316 | dist: config.mk | 332 | dist: clean config.mk |
317 | mv config.sh config.sh.old | ||
318 | mv config.status config.status.old | ||
319 | $(MAKE) distclean | ||
320 | mv config.status.old config.status | ||
321 | mv config.sh.old config.sh | ||
322 | rm -fr $(TARNAME)-$(VERSION) $(TARNAME)-$(VERSION).tar.xz | 333 | rm -fr $(TARNAME)-$(VERSION) $(TARNAME)-$(VERSION).tar.xz |
323 | mkdir -p $(TARNAME)-$(VERSION)/test | 334 | mkdir -p $(TARNAME)-$(VERSION)/test |
324 | cp -a $(DISTFILES) $(TARNAME)-$(VERSION) | 335 | cp -a $(DISTFILES) $(TARNAME)-$(VERSION) |
325 | cp -a $(DISTFILES_TEST) $(TARNAME)-$(VERSION)/test | 336 | cp -a $(DISTFILES_TEST) $(TARNAME)-$(VERSION)/test |
326 | rm -rf $(TARNAME)-$(VERSION)/src/tools | 337 | rm -rf $(TARNAME)-$(VERSION)/src/tools |
327 | find $(TARNAME)-$(VERSION) -name .svn -delete | ||
328 | tar -cJvf $(TARNAME)-$(VERSION).tar.xz $(TARNAME)-$(VERSION) | 338 | tar -cJvf $(TARNAME)-$(VERSION).tar.xz $(TARNAME)-$(VERSION) |
329 | rm -fr $(TARNAME)-$(VERSION) | 339 | rm -fr $(TARNAME)-$(VERSION) |
330 | 340 | ||
331 | .PHONY: asc | 341 | .PHONY: asc |
332 | asc: config.mk | 342 | asc: config.sh |
333 | ./mkasc.sh $(VERSION) | 343 | ./mkasc.sh |
334 | 344 | ||
335 | .PHONY: deb | 345 | .PHONY: deb |
336 | deb: dist config.sh | 346 | deb: dist config.sh |
@@ -3,11 +3,13 @@ | |||
3 | # Copyright (C) 2014-2023 Firejail Authors | 3 | # Copyright (C) 2014-2023 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | echo "Calculating SHA256 for all files in /transfer - firejail version $1" | 6 | . "$(dirname "$0")/config.sh" |
7 | |||
8 | printf 'Calculating SHA256 for all files in /transfer - %s version %s' "$TARNAME" "$VERSION" | ||
7 | 9 | ||
8 | cd /transfer || exit 1 | 10 | cd /transfer || exit 1 |
9 | sha256sum ./* > "firejail-$1-unsigned" | 11 | sha256sum ./* > "$TARNAME-$VERSION-unsigned" |
10 | gpg --clearsign --digest-algo SHA256 < "firejail-$1-unsigned" > "firejail-$1.asc" | 12 | gpg --clearsign --digest-algo SHA256 < "$TARNAME-$VERSION-unsigned" > "$TARNAME-$VERSION.asc" |
11 | gpg --verify "firejail-$1.asc" | 13 | gpg --verify "$TARNAME-$VERSION.asc" |
12 | gpg --detach-sign --armor "firejail-$1.tar.xz" | 14 | gpg --detach-sign --armor "$TARNAME-$VERSION.tar.xz" |
13 | rm "firejail-$1-unsigned" | 15 | rm "$TARNAME-$VERSION-unsigned" |
diff --git a/src/fnetlock/main.c b/src/fnetlock/main.c index b76be029d..d4169b7e1 100644 --- a/src/fnetlock/main.c +++ b/src/fnetlock/main.c | |||
@@ -94,7 +94,8 @@ static void run_trace(void) { | |||
94 | 94 | ||
95 | unsigned start = time(NULL); | 95 | unsigned start = time(NULL); |
96 | unsigned char buf[MAX_BUF_SIZE]; | 96 | unsigned char buf[MAX_BUF_SIZE]; |
97 | unsigned bw = 0; // bandwidth calculations | 97 | // FIXME: error: variable 'bw' set but not used [-Werror,-Wunused-but-set-variable] |
98 | //unsigned bw = 0; // bandwidth calculations | ||
98 | 99 | ||
99 | int printed = 0; | 100 | int printed = 0; |
100 | while (1) { | 101 | while (1) { |
@@ -149,7 +150,8 @@ static void run_trace(void) { | |||
149 | #endif | 150 | #endif |
150 | // filter out loopback traffic | 151 | // filter out loopback traffic |
151 | if (buf[12] != 127 && buf[16] != 127) { | 152 | if (buf[12] != 127 && buf[16] != 127) { |
152 | bw += bytes + 14; // assume a 14 byte Ethernet layer | 153 | // FIXME: error: variable 'bw' set but not used [-Werror,-Wunused-but-set-variable] |
154 | //bw += bytes + 14; // assume a 14 byte Ethernet layer | ||
153 | 155 | ||
154 | uint32_t ip_src; | 156 | uint32_t ip_src; |
155 | memcpy(&ip_src, buf + 12, 4); | 157 | memcpy(&ip_src, buf + 12, 4); |