/mandos/trunk

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

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2009-02-12 18:56:52 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090212185652-ast00yprt2pe2l4p
Overflows are not detected by sscanf(), so stop using it:

* plugin-runner.c (main/parse_opt): Change from using "sscanf()" to
                                    "strtoimax()".
* plugins.d/mandos-client.c (main/parse_opt, main): Change from using
                                                    "sscanf()" to
                                                    "strtoimax()" and
                                                    "strtof()".
* splashy.c (main): Change from using "sscanf()" to "strtoimax()".
* usplash.c (main): - '' -

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 \
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
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
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
13
LINK_FORTIFY_LD=-z relro -fPIE
 
14
LINK_FORTIFY=-pie
14
15
#COVERAGE=--coverage
15
16
OPTIMIZE=-Os
16
17
LANGUAGE=-std=gnu99
17
18
htmldir=man
18
 
version=1.0.3
 
19
version=1.0.5
19
20
SED=sed
20
21
 
21
22
## Use these settings for a traditional /usr/local install
45
46
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
46
47
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
47
48
        -DVERSION='"$(version)"'
48
 
LDFLAGS=$(COVERAGE) $(foreach flag,$(LINK_FORTIFY),-Xlinker $(flag))
 
49
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
49
50
 
50
51
# Commands to format a DocBook <refentry> document into a manual page
51
52
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
76
77
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
77
78
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
78
79
CPROGS=plugin-runner $(PLUGINS)
79
 
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
 
80
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
80
81
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
81
82
        plugins.d/mandos-client.8mandos \
82
83
        plugins.d/password-prompt.8mandos mandos.conf.5 \
163
164
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
164
165
                $@
165
166
 
166
 
mandos-list: Makefile
 
167
mandos-ctl: Makefile
167
168
        $(SED) --in-place \
168
169
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
169
170
                $@
202
203
run-client: all keydir/seckey.txt keydir/pubkey.txt
203
204
        ./plugin-runner --plugin-dir=plugins.d \
204
205
                --config-file=plugin-runner.conf \
205
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
206
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
207
                $(CLIENTARGS)
206
208
 
207
209
# Used by run-client
208
210
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
211
213
 
212
214
# Run the server with a local config
213
215
run-server: confdir/mandos.conf confdir/clients.conf
214
 
        ./mandos --debug --configdir=confdir
 
216
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
215
217
 
216
218
# Used by run-server
217
219
confdir/mandos.conf: mandos.conf
283
285
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
284
286
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
285
287
        install initramfs-tools-script \
286
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
288
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
287
289
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
288
290
        gzip --best --to-stdout mandos-keygen.8 \
289
291
                > $(MANDIR)/man8/mandos-keygen.8.gz
330
332
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
331
333
                $(INITRAMFSTOOLS)/hooks/mandos \
332
334
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
333
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
335
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
334
336
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
335
337
                $(MANDIR)/man8/mandos-keygen.8.gz \
336
338
                $(MANDIR)/man8/password-prompt.8mandos.gz \