Skip to content
This repository was archived by the owner on Oct 7, 2024. It is now read-only.

Commit 75b3a0e

Browse files
committed
Move changes to separate repository
1 parent 990e60b commit 75b3a0e

13 files changed

Lines changed: 1499 additions & 2276 deletions

.gitignore

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
docbook-xsl.css
2-
isolate
3-
isolate.1
4-
isolate.1.html
5-
*.o
1+
isolate

.travis.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

Makefile

Lines changed: 9 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,7 @@
22
# (c) 2015--2019 Martin Mares <mj@ucw.cz>
33
# (c) 2017 Bernard Blackham <bernard@blackham.com.au>
44

5-
all: isolate isolate.1 isolate.1.html isolate-check-environment
6-
7-
CC=gcc
8-
CFLAGS=-std=gnu99 -Wall -Wextra -Wno-parentheses -Wno-unused-result -Wno-missing-field-initializers -Wstrict-prototypes -Wmissing-prototypes -D_GNU_SOURCE
9-
LIBS=-lcap
10-
11-
VERSION=1.8.1
12-
YEAR=2019
13-
BUILD_DATE:=$(shell date '+%Y-%m-%d')
14-
BUILD_COMMIT:=$(shell if git rev-parse >/dev/null 2>/dev/null ; then git describe --always --tags ; else echo '<unknown>' ; fi)
5+
# minified to the bare essentials by Vasiluta Mihai-Alexandru <alexv@siluta.ro>
156

167
PREFIX = $(DESTDIR)/usr/local
178
VARPREFIX = $(DESTDIR)/var/local
@@ -20,48 +11,25 @@ CONFIG = $(CONFIGDIR)/isolate
2011
BINDIR = $(PREFIX)/bin
2112
DATAROOTDIR = $(PREFIX)/share
2213
DATADIR = $(DATAROOTDIR)
23-
MANDIR = $(DATADIR)/man
24-
MAN1DIR = $(MANDIR)/man1
2514
BOXDIR = $(VARPREFIX)/lib/isolate
2615

16+
CC=gcc
17+
CFLAGS=-std=gnu99 -Wall -Wextra -Wno-parentheses -Wno-unused-result -Wno-missing-field-initializers -Wstrict-prototypes -Wmissing-prototypes -D_GNU_SOURCE -DCONFIG_FILE='"$(CONFIG)"'
18+
LIBS=-lcap
19+
20+
2721
isolate: isolate.o util.o rules.o cg.o config.o
2822
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
29-
23+
3024
%.o: %.c isolate.h config.h
3125
$(CC) $(CFLAGS) -c -o $@ $<
3226

33-
isolate.o: CFLAGS += -DVERSION='"$(VERSION)"' -DYEAR='"$(YEAR)"' -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_COMMIT='"$(BUILD_COMMIT)"'
34-
config.o: CFLAGS += -DCONFIG_FILE='"$(CONFIG)"'
35-
36-
isolate.1: isolate.1.txt
37-
a2x -f manpage $<
38-
39-
# The dependency on isolate.1 is there to serialize both calls of asciidoc,
40-
# which does not name temporary files safely.
41-
isolate.1.html: isolate.1.txt isolate.1
42-
a2x -f xhtml -D . $<
43-
4427
clean:
4528
rm -f *.o
46-
rm -f isolate isolate.1 isolate.1.html
47-
rm -f docbook-xsl.css
4829

49-
install: isolate isolate-check-environment
30+
install: isolate
5031
install -d $(BINDIR) $(BOXDIR) $(CONFIGDIR)
51-
install isolate-check-environment $(BINDIR)
5232
install -m 4755 isolate $(BINDIR)
5333
install -m 644 default.cf $(CONFIG)
5434

55-
install-doc: isolate.1
56-
install -d $(MAN1DIR)
57-
install -m 644 $< $(MAN1DIR)/$<
58-
59-
release: isolate.1.html
60-
git tag v$(VERSION)
61-
git push --tags
62-
git archive --format=tar --prefix=isolate-$(VERSION)/ HEAD | gzip >isolate-$(VERSION).tar.gz
63-
rsync isolate-$(VERSION).tar.gz atrey:ftp/isolate/
64-
rsync isolate.1.html jw:/var/www/moe/
65-
ssh jw 'cd web && bin/release-prog isolate $(VERSION)'
66-
67-
.PHONY: all clean install install-doc release
35+
.PHONY: all clean install

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
isolate
2-
=======
1+
# isolate
2+
3+
NOTE: This is a fork of the [original repository](https://github.com/ioi/isolate) stripped to the most important parts. I may modify this to better suit my needs.
34

45
Isolate is a sandbox built to safely run untrusted executables,
56
offering them a limited-access environment and preventing them from
@@ -25,5 +26,5 @@ is available online.
2526
To compile Isolate, you need the headers for the libcap library
2627
(usually available in a libcap-dev package).
2728

28-
You may need `a2x` (found in [AsciiDoc](http://www.methods.co.nz/asciidoc/a2x.1.html)) for building manual.
29+
(NOTE: I removed the documentation, get it from the original repository) You may need `a2x` (found in [AsciiDoc](http://www.methods.co.nz/asciidoc/a2x.1.html)) for building manual.
2930
But if you only want the isolate binary, you can just run `make isolate`

TODO

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)