github-starred/firejail
2
0
Fork 0
mirror of https://github.com/netblue30/firejail.git synced 2026-05-21 06:45:29 -06:00
Code Issues 531 Projects Packages Wiki Activity Actions 1

Merge pull request #102 from reinerh/master

Browse source 
Use configured libdir instead of $prefix/lib
This commit is contained in:
netblue30 2015-10-27 12:58:37 -04:00
commit b2a819227f
4 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/firejail/Makefile.in
View file

@ -1,6 +1,9 @@
all: firejail
PREFIX=@prefix@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
VERSION=@PACKAGE_VERSION@
NAME=@PACKAGE_NAME@
HAVE_SECCOMP_H=@HAVE_SECCOMP_H@
@ -13,7 +16,7 @@ H_FILE_LIST = $(wildcard *.[h])
C_FILE_LIST = $(wildcard *.c)
OBJS = $(C_FILE_LIST:.c=.o)
BINOBJS = $(foreach file, $(OBJS), $file)
CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -DPREFIX='"$(PREFIX)"' $(HAVE_SECCOMP) $(HAVE_SECCOMP_H) $(HAVE_CHROOT) $(HAVE_BIND) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security
CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -DPREFIX='"$(prefix)"' -DLIBDIR='"$(libdir)"' $(HAVE_SECCOMP) $(HAVE_SECCOMP_H) $(HAVE_CHROOT) $(HAVE_BIND) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security
LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread
%.o : %.c $(H_FILE_LIST)

10
src/firejail/bandwidth.c
View file

@ -447,18 +447,18 @@ void bandwidth_pid(pid_t pid, const char *command, const char *dev, int down, in
cmd = NULL;
if (devname) {
if (strcmp(command, "set") == 0) {
if (asprintf(&cmd, "%s/lib/firejail/fshaper.sh --%s %s %d %d",
PREFIX, command, devname, down, up) == -1)
if (asprintf(&cmd, "%s/firejail/fshaper.sh --%s %s %d %d",
LIBDIR, command, devname, down, up) == -1)
errExit("asprintf");
}
else {
if (asprintf(&cmd, "%s/lib/firejail/fshaper.sh --%s %s",
PREFIX, command, devname) == -1)
if (asprintf(&cmd, "%s/firejail/fshaper.sh --%s %s",
LIBDIR, command, devname) == -1)
errExit("asprintf");
}
}
else {
if (asprintf(&cmd, "%s/lib/firejail/fshaper.sh --%s", PREFIX, command) == -1)
if (asprintf(&cmd, "%s/firejail/fshaper.sh --%s", LIBDIR, command) == -1)
errExit("asprintf");
}
assert(cmd);

2
src/firejail/fs_trace.c
View file

@ -58,7 +58,7 @@ void fs_trace(void) {
FILE *fp = fopen(preload, "w");
if (!fp)
errExit("fopen");
fprintf(fp, "%s/lib/firejail/libtrace.so\n", PREFIX);
fprintf(fp, "%s/firejail/libtrace.so\n", LIBDIR);
fclose(fp);
if (chown(preload, 0, 0) < 0)
errExit("chown");

2
src/firejail/output.c
View file

@ -88,7 +88,7 @@ void check_output(int argc, char **argv) {
continue;
ptr += sprintf(ptr, "%s ", argv[i]);
}
sprintf(ptr, "| %s/lib/firejail/ftee %s", PREFIX, outfile);
sprintf(ptr, "| %s/firejail/ftee %s", LIBDIR, outfile);
// run command
char *a[4];