/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to Makefile

* plugins.d/askpass-fifo.c: Do close(STDOUT_FILENO) before exiting to
                            check its return code.  Use exit codes
                            from <sysexits.h>.
* plugins.d/splashy.c: Use exit codes from <sysexits.h> in the fork to
                       exec the "splashy_update" command.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
4
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
8
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
 
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
12
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIE -pie
13
 
LINK_FORTIFY=-z relro -pie
 
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
 
12
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
13
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
14
LINK_FORTIFY_LD=-z relro -fPIE
 
15
LINK_FORTIFY=-pie
14
16
#COVERAGE=--coverage
15
17
OPTIMIZE=-Os
16
18
LANGUAGE=-std=gnu99
17
19
htmldir=man
18
 
version=1.0.3
 
20
version=1.0.12
19
21
SED=sed
20
22
 
21
23
## Use these settings for a traditional /usr/local install
34
36
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
35
37
##
36
38
 
37
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
38
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
39
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
40
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
39
41
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
40
42
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
41
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
42
 
GPGME_LIBS=$(shell gpgme-config --libs)
 
43
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
44
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
45
        getconf LFS_LDFLAGS)
43
46
 
44
47
# Do not change these two
45
48
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
46
49
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
47
50
        -DVERSION='"$(version)"'
48
 
LDFLAGS=$(COVERAGE) $(foreach flag,$(LINK_FORTIFY),-Xlinker $(flag))
 
51
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
49
52
 
50
53
# Commands to format a DocBook <refentry> document into a manual page
51
54
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
76
79
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
77
80
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
78
81
CPROGS=plugin-runner $(PLUGINS)
79
 
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
 
82
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
80
83
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
81
84
        plugins.d/mandos-client.8mandos \
82
85
        plugins.d/password-prompt.8mandos mandos.conf.5 \
150
153
# Update all these files with version number $(version)
151
154
common.ent: Makefile
152
155
        $(SED) --in-place \
153
 
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
156
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
154
157
                $@
155
158
 
156
159
mandos: Makefile
163
166
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
164
167
                $@
165
168
 
166
 
mandos-list: Makefile
 
169
mandos-ctl: Makefile
167
170
        $(SED) --in-place \
168
171
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
169
172
                $@
175
178
        $(SED) --in-place \
176
179
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
177
180
                $@
 
181
        $(SED) --in-place \
 
182
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
 
183
                $@
178
184
 
179
185
plugins.d/mandos-client: plugins.d/mandos-client.o
180
186
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
199
205
run-client: all keydir/seckey.txt keydir/pubkey.txt
200
206
        ./plugin-runner --plugin-dir=plugins.d \
201
207
                --config-file=plugin-runner.conf \
202
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
208
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
209
                $(CLIENTARGS)
203
210
 
204
211
# Used by run-client
205
212
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
208
215
 
209
216
# Run the server with a local config
210
217
run-server: confdir/mandos.conf confdir/clients.conf
211
 
        ./mandos --debug --configdir=confdir
 
218
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
212
219
 
213
220
# Used by run-server
214
221
confdir/mandos.conf: mandos.conf
280
287
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
281
288
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
282
289
        install initramfs-tools-script \
283
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
290
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
284
291
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
285
292
        gzip --best --to-stdout mandos-keygen.8 \
286
293
                > $(MANDIR)/man8/mandos-keygen.8.gz
327
334
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
328
335
                $(INITRAMFSTOOLS)/hooks/mandos \
329
336
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
330
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
337
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
331
338
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
332
339
                $(MANDIR)/man8/mandos-keygen.8.gz \
333
340
                $(MANDIR)/man8/password-prompt.8mandos.gz \