Added patch to fix libdir path.
Reiner Herrmann
8 years ago
| 0 | Author: Reiner Herrmann <reiner@reiner-h.de> | |
| 1 | Description: Adapt paths to use the correct lib dir | |
| 2 | ||
| 3 | Index: firejail/src/firejail/Makefile.in | |
| 4 | =================================================================== | |
| 5 | --- firejail.orig/src/firejail/Makefile.in | |
| 6 | +++ firejail/src/firejail/Makefile.in | |
| 7 | @@ -1,6 +1,8 @@ | |
| 8 | all: firejail | |
| 9 | ||
| 10 | +prefix=@prefix@ | |
| 11 | PREFIX=@prefix@ | |
| 12 | +LIBDIR=@libdir@ | |
| 13 | VERSION=@PACKAGE_VERSION@ | |
| 14 | NAME=@PACKAGE_NAME@ | |
| 15 | HAVE_SECCOMP_H=@HAVE_SECCOMP_H@ | |
| 16 | @@ -13,7 +15,7 @@ H_FILE_LIST = $(wildcard *.[h]) | |
| 17 | C_FILE_LIST = $(wildcard *.c) | |
| 18 | OBJS = $(C_FILE_LIST:.c=.o) | |
| 19 | BINOBJS = $(foreach file, $(OBJS), $file) | |
| 20 | -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 | |
| 21 | +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 | |
| 22 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread | |
| 23 | ||
| 24 | %.o : %.c $(H_FILE_LIST) | |
| 25 | Index: firejail/src/firejail/bandwidth.c | |
| 26 | =================================================================== | |
| 27 | --- firejail.orig/src/firejail/bandwidth.c | |
| 28 | +++ firejail/src/firejail/bandwidth.c | |
| 29 | @@ -447,18 +447,18 @@ void bandwidth_pid(pid_t pid, const char | |
| 30 | cmd = NULL; | |
| 31 | if (devname) { | |
| 32 | if (strcmp(command, "set") == 0) { | |
| 33 | - if (asprintf(&cmd, "%s/lib/firejail/fshaper.sh --%s %s %d %d", | |
| 34 | - PREFIX, command, devname, down, up) == -1) | |
| 35 | + if (asprintf(&cmd, "%s/firejail/fshaper.sh --%s %s %d %d", | |
| 36 | + LIBDIR, command, devname, down, up) == -1) | |
| 37 | errExit("asprintf"); | |
| 38 | } | |
| 39 | else { | |
| 40 | - if (asprintf(&cmd, "%s/lib/firejail/fshaper.sh --%s %s", | |
| 41 | - PREFIX, command, devname) == -1) | |
| 42 | + if (asprintf(&cmd, "%s/firejail/fshaper.sh --%s %s", | |
| 43 | + LIBDIR, command, devname) == -1) | |
| 44 | errExit("asprintf"); | |
| 45 | } | |
| 46 | } | |
| 47 | else { | |
| 48 | - if (asprintf(&cmd, "%s/lib/firejail/fshaper.sh --%s", PREFIX, command) == -1) | |
| 49 | + if (asprintf(&cmd, "%s/firejail/fshaper.sh --%s", LIBDIR, command) == -1) | |
| 50 | errExit("asprintf"); | |
| 51 | } | |
| 52 | assert(cmd); | |
| 53 | Index: firejail/src/firejail/fs_trace.c | |
| 54 | =================================================================== | |
| 55 | --- firejail.orig/src/firejail/fs_trace.c | |
| 56 | +++ firejail/src/firejail/fs_trace.c | |
| 57 | @@ -58,7 +58,7 @@ void fs_trace(void) { | |
| 58 | FILE *fp = fopen(preload, "w"); | |
| 59 | if (!fp) | |
| 60 | errExit("fopen"); | |
| 61 | - fprintf(fp, "%s/lib/firejail/libtrace.so\n", PREFIX); | |
| 62 | + fprintf(fp, "%s/firejail/libtrace.so\n", LIBDIR); | |
| 63 | fclose(fp); | |
| 64 | if (chown(preload, 0, 0) < 0) | |
| 65 | errExit("chown"); | |
| 66 | Index: firejail/src/firejail/output.c | |
| 67 | =================================================================== | |
| 68 | --- firejail.orig/src/firejail/output.c | |
| 69 | +++ firejail/src/firejail/output.c | |
| 70 | @@ -88,7 +88,7 @@ void check_output(int argc, char **argv) | |
| 71 | continue; | |
| 72 | ptr += sprintf(ptr, "%s ", argv[i]); | |
| 73 | } | |
| 74 | - sprintf(ptr, "| %s/lib/firejail/ftee %s", PREFIX, outfile); | |
| 75 | + sprintf(ptr, "| %s/firejail/ftee %s", LIBDIR, outfile); | |
| 76 | ||
| 77 | // run command | |
| 78 | char *a[4]; |